Merge pull request #1091 from tandraschko/master

Fixed version and build