Merge pull request #3 from Madlohe/master