version 0.9a (fix)
merged with Hauke's latest master branch