Resolved issue27
Resolved issue #28