Fix issues #56 & #57
Fix issues #56 & #57