Merge pull request #129 from Krellan/master