Trying to fix #1

Trying to fix #1.
Merge pull request #16 from milivojm/untested

Fix #1