fixes #43
fix test
Merge pull request #44 from enilsen16/refactor

Fix #43