bug #123 fix

develop 12, 13 commit

develop 18,19 commit