Fixed issues #2 #8