Various Fix
Merge pull request #31 from ale8530/master

Various Fix