Fixed issues #2 and #4