Merge pull request #44 from fedosov/master

This should fix #42
[fix] fixes address module switch cases
[version] Bumped Version