Fixed the issue #14 and #15