copy from skeleton
Merge pull request #64 from jdrew2/master

Jordan Drew