cpy from skeleton
Merge pull request #21 from jmgensemer/master

cpy from skeleton