Merge pull request #18 from Gonthim/master
Merge pull request #20 from Gonthim/master

Forgot to change the build class when I refactored