mish fixes - 3
Merge pull request #7 from realtebo/master

mish fixes - 3