codereview fixes for ef310ba25bace372595586b6ee782992204a3f5c
Released v0.2.2