Merge pull request #2 from pderksen/master

Update from original (2.1.5)