fixed #118
Merge pull request #123 from czardoz/master

fix for #118