Fix more stuffs
Merge pull request #129 from buddytex/Dev

Fix more stuffs