fixed issue #3
Merge branch 'master' into dazoe_lib