Fixed issues #15 and #16