Merge pull request #48 from plieven/master