- closes #42 thanks to @marcelod
- did a little code cleanup