merge functionality from 'master' branch

Jan Breuer

2013-10-23 59d4618036c85dafc9026d0f84ab00fcb900acc9

 .gitignore

@@ -16,6 +16,7 @@
*.out
*.app
*.test
examples/*/test

# Backup files
*~