Build optimization
Merge pull request #3 from fr500/master

Build optimization