Some corrections for 1.0.5.2
Merge pull request #141 from trk/master

Some corrections for 1.0.5.2