Merge pull request #23 from rogerthomas84/master

master to dev