Resolved issue #62
Resvoled issue #64