Merge pull request #564 from nelenkov/dev

fixes #562
Merge pull request #565 from nelenkov/dev

bumped for alpha release
bumped alpha version