Update version & build scripts & dependencies
Undo unnecessary changes in build script
Merge pull request #214 from tpetricek/mainline

Update version, fix build scripts & update dependencies