Changes all logic and fixed some  problems with this progect
test commit to github