Huge refactor
Release 2014-08-28T13:57:38Z