Merge pull request #20 from mattphoto/mattkim

matt kim
this commit is baaaaad

No, for real–it's wrong.
more changes