copy from skeleton
Merge pull request #13 from jemcpherson/master

Joshua McPherson