merged pull requests #7,8,9