typo fix
Merge pull request #6 from dsteinbrunner/patch-1

typo fix
conflict info
bump version; changelog
Added tag 0.031_05 for changeset 0247cd08c3c7