Addressed code review comments, see #44.