Refactoring
Bug fixes
Merge branch 'master'