Fixed issue #12 and #11