Merge pull request #1 from ysadka/develop

Develop
Merge pull request #2 from ysadka/develop

Develop
Merge branch 'master' of https://github.com/ysadka/wage-flow into develop

# Via Yaron Sadka
* 'master' of https://github.com/ysadka/wage-flow: