Merge pull request #1 from mattcifelli/master

pull from master branch
Merge pull request #1 from shd1776/master

Merge pull request #1 from mattcifelli/master