merging pull request# 259