test case for #18
Merge branch 'master' into fix18
Merge branch 'master' into fix18
Merge branch 'fix18' into issues/18