quick fix for issue #14, this prevents just the crash and does not solve the origin of the bug
Merge pull request #1 from usq/master

quick fix for issue #14, this prevents just the crash and does not solve...