Some refactoring of the Master
Merge pull request #25 from johandahlberg/feature/master_refactoring

Some refactoring of the Master