Merge pull request #231 from penek/master