improve approval
Merge branch 'master' into feature/approval
Merge pull request #68 from dtornow/feature/approval

Feature/approval