My first pull request. Hahaha.

Latest changes as of 2/2/2014