20140323.02 - implemented #179 #181 #184 #185 #186 and rejected #183