Commit for release
merged back fix for #91
Commit for release