Started working on a new version in master branch, put the old one into "initial" branch