Revert 55b4b57..abbccdb

This rolls back to commit 55b4b57994078ba144b5f55214d7508690d42b6a.
fixes #17 & #9