Merge pull request #3 from andrewdex/master

pull for updates