Update - Minimal fixes
Merge pull request #28 from MCC900/patch-5

Update - Minimal fixes