copy from skeleton
Merge pull request #18 from amshahan/master

Austin Shahan