Fixed issues #1, #2