merge to master

Fork was deleted, move development to master branch