Resolved issue #36
Prepare for merge with master