joelambert Merge pull request #14 from iamralpht/master