Merge pull request #3 from txiasummer/master

merge develop to master
Merge pull request #4 from txiasummer/develop

Merge pull request #3 from txiasummer/master