Fix Issue #18
Merge branch 'Issue18'