Merge pull request #44 from folieadrien/refactoring

improve build