Fix for issue #4 and #5 by @fiveminuteargument complete
Fix for issue #4 and #5 by @fiveminuteargument complete