Resolved issue #15 and enhancement #13