commit on 25.05.2014 v1