Fixes #34

Some kind of warning needs to be added but this is less hostile to
users than what happened previosuly.
Merge branch 'Issue-#34'