Fixed issues #7, #8 and #9.