Feature/gem 20130612