Merge pull request #1 from mattcifelli/master

pull from master branch