Merge pull request #22 from chuckpreslar/v0.3

v0.2.3
Merge branch 'master' of github.com:chuckpreslar/codex into v0.3