Merge pull request #272 from pliviu/master