Issue 22 fix

new rebased commits