copy from skeleton
Merge pull request #20 from bmccaule/master

Brandon McCauley