Fixed various issues with this version.
Please refer to README.md for a complete list of changes.
Merge pull request #391 from BorisKozo/fix_marionette

Fixed the remaining bugs in Marionette implementation