Merge pull request #109 from rnagy/master