ready for deployment
Merge pull request #1 from mmell/master

ready for deployment