Merge pull request #14 from rwwarren/dev

Dev
Merge pull request #15 from rwwarren/dev

Dev
Merge pull request #16 from rwwarren/dev

Dev
Merge branch 'master' into dev