copy from skeleton
Merge pull request #7 from aburky/master

copy from skeleton