add fix3 and fix4
Merge pull request #3 from man4j/fix3

Fix3 and fix4