implemented
Merge branch 'develop' of https://github.com/florensh/wefactor into develop