merge functionality from 'master' branch

Jan Breuer

2013-10-23 59d4618036c85dafc9026d0f84ab00fcb900acc9

 .gitignore

@@ -15,9 +15,11 @@
*.exe
*.out
*.app
*.test
examples/*/test

# Backup files
*~
/netbeans/nbproject/private/
/netbeans/build/Debug/
/netbeans/dist/Debug/
/libscpi/obj/
/libscpi/dist/