adapted for linux compilation
minor changes
Merge branch 'master' of github.com:marlowe-ml/Voltricity