Changes for issue #642 

Bumped versions
Fixed issue #642
Couple of minor bug fixes