Merge pull request #1 from The-Dream-Team/master

Pull from master
Merge remote-tracking branch 'upstream/master'
rebump version
Merge pull request #4 from katiewood/master

bump version