Fix issue #61 and close #64