Fixing issue #66. Unfortunately this change breaks 0.1 docs and some code