commit on 12.07.2014 v3