Issue/#30

Fixes #30