Merge pull request #43 from plieven/master