v1.2.0: Fixed #2 and Fixed #3

Fixed issues #2 and #3