Merge pull request #18 from chuckpreslar/v0.3

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