Fixes #16

* All points of issue are covered