fix for issue #16
Merge branch 'issue/16' into demo