fix for issue #3
Merge branch 'devel' into examples