Refactoring
Merge branch 'dev' into testing