Update - Minimal fixes
Merge pull request #29 from MCC900/patch-6

Update - Minimal fixes