Merge pull request #59 from fluffynuts/update-build-system

Update build system