fasterthanlime Merge pull request #2 from Deozaan/master