Merge pull request #3 from JamesLeB/dev

Dev