Merge branch 'master' of github.com:edsu/ginger
Changed to return error. Remove TODO that's been done.
Merge branch 'master' of github.com:eikeon/ginger