Merge pull request #23 from rogerthomas84/master

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

Merge pull request #23 from rogerthomas84/master