Merged everything into master branch