Fixed issues #13