MaJ Patch 1.7.3
Merge pull request #48 from Jyru-Ken/master

Update for 1.7.3