Finish user stories #39 and #34
Merge branch 'master' of github.com:del82/ezra