greenish Merge pull request #4 from dianedufort/master