Merge pull request #1 from harlo/master

Please review latest upgrades