Version v1.0.1 containting fixes for #82 and #83