Should fix issues #2 and #3

Issues #2 and #3