Merge pull request #169 from kasal/master