copy from skeleton
Merge pull request #15 from tjreardon/master

tjreardon