Merge pull request #87 from rbalint/master