Merge pull request #20 from rogerthomas84/master

master to dev