Merge pull request #3 from txiasummer/master

merge develop to master