Improving and updating build.
Merge branch 'master' of github.com:daffl/uberproto into fntest