Various Fixes
Obtain Fix
Merge pull request #25 from Windower/master

Sync