If we're gonna do this...
Merge pull request #28 from Mekire/master

If we're gonna do this...