Merge pull request #265 from hhromic/master