Fixed issue #13 and #14