Fixed failed merge;
Added a new Field model;
Added documentation framework;