[imp] build improvements
Merge pull request #175 from phproberto/build

[imp] build improvements