copy from skeleton
Merge pull request #23 from zpepper1128/master

Zachary Pepper