Merge pull request #20 from rogerthomas84/master

master to dev
Merge pull request #21 from rogerthomas84/origin/dev

Merge pull request #20 from rogerthomas84/master