Fixed issues #2, #3, #4, #6