Prepared working version for a merge with master branch