Fixed issues #23, #22, #21, #26