updated funcs
Merge branch 'master' of https://github.com/prohel/whms
Merge branch 'master' of https://github.com/prohel/whms
everything