ebassi Merge pull request #43 from Emerentius/master