Feature/roboguice