some bug fix and updated version
Merge pull request #1 from probepark/master

some bug fix and updated version