Merged master branch with working