Bumped versions
Fixed issue #642
Couple of minor bug fixes
Merge pull request #644 from BorisKozo/bugfixes

Marionette - Changes for issue #642