copy from skeleton
Merge pull request #41 from dmatheny/master

copy from skeleton