Resolved issue #31
Merge branch 'issue31'