roberto's modification
Merge branch 'master' of https://github.com/yorsh87/at-work-software