Client requests (03.11.2014) and small rework