Updating build process, example
Merged from master