fix5 code changes
Merge pull request #5 from jandi02/fix5

fix5 code changes