Merge pull request #3 from timothyong/master

asdf
Pixel rollback