fix for issue #20.
maven package
Merge branch 'feature/fix_for_issue_20' into develop