Merge pull request #1 from mikera/master

Latest updates