Implement/fix issues #19, #20. Additionally make some cleanup work.

Signed-off-by: Daniel Schnell <dschnell@skerpa.com>
Version bump to 0.0.10

Signed-off-by: Daniel Schnell <dschnell@skerpa.com>