Update build system
Merge pull request #7 from roignac/master

Updated buildsystem