Fix for issues #42 and #43

Corrected some minor cosmetic issues for #42 and #43