Misc changes
Merge pull request #1 from IDWMaster/master

Misc changes