all solutions working on my computer
Merge branches 'refactoring' and 'master'