copy from skeleton
Merge pull request #54 from phfanelli/master

Philip Fanelli