copy from skeleton
Merge pull request #40 from dpucci0493/master

copy from skeleton