First working test release
Merge branches 'master' and 'new_branch'