Feature/update 2014 05 30