pull requests #3 and #4