Merge pull request #28 from Windower/master

Sync
Merge pull request #30 from Windower/master

sync
JA Error handling and various fixes
Merge pull request #263 from nitrous24/master

JA Error handling and various fixes (ohShi)