Fix issues #5 and #3