Issue 42 done
Issue 43 done
Merge branch 'master' of https://github.com/commentatorboy/sw607f14