Fixed issues #2,#8
Fixed issues #2,#8