Merge pull request #57 from drobbs/master

Beta build