Fixing build
Merge branch 'master' of github.com:bldr-io/bldr

* 'master' of github.com:bldr-io/bldr: