Package version 1.0.1, issues #3 and #4