Fixes #42
Merge pull request #43 from Cyberlightning/fix/42

Fix/42