Merge pull request #3 from afalsario/mine

Mine
Merge branch 'master' into mine