copy from skeleton
Merge pull request #75 from mdlundquist/master

copy from skeleton