Merge pull request #13 from rwwarren/dev

Dev