Fixed bug FS#75, moved utility wrapper code to wrapper.
Merge branch 'develop' of github.com:AndySomogyi/roadrunner into develop