fixed various errors
bug #135 fixed various errors (fabpot)

This PR was merged into the 3.0-dev branch.

Discussion
----------

fixed various errors

Commits
-------

69ae4ad fixed various errors