Fixes for linux pases
Merge branch 'development' of github.com:forzi/stradivari into development