Refactor
Merge branch 'dev' of github-rickardz:rickardz/SchemeApp into dev