* some fixes
Merge pull request #146 from POPSuL/fixes

* some fixes