Update source to match docs
Merge pull request #3 from Caltech-CS3-2014/source

Update source to match docs (unit tests TODO)