issue #93 and #86
Merge branch 'master' of https://github.com/deniskoronchik/sc-web