Fixed issues #20