first version of implementation
finished implementation
Merge branch 'master' of github.com:Imbalism/588repo