Merge pull request #4 from clamstew/master

Merge add building