Merge pull request #2 from frankhale/master

More infrastructure