Merge pull request #519 from nelenkov/master

bumped version for minor release
backported fix for #562 to master