Merge pull request #13 from andrewdex/master

Latest Merge