included changes of pull request # 4