Resolved issue #42 and #66