Some quick fixes
Test needs to mimic function.
Merge pull request #4 from kissmetrics/quick-fixes

Some quick fixes