Merge pull request #28 from Gatzy118/nick-new

Fixed build
Merge branch 'master' into nick-new