This addresses issues #22 (closed) and #24 (closed)
This is ready for merge into master. Although I am not sure I understand why the code style fails here on git (I updated yapf on my computer and used it to correct the code style but maybe I am missing a detail here?).
