Merge pull request #124 from tokkee/bj/build