fixes #32
Merge branch 'master' into issue32_fixes_fileversion
Merge branch 'issue32_fixes_fileversion'