improvements
Merge branch 'master' of https://github.com/lucnygr/dp2013_g17_1