Added dynamic controller loading and wrap support
Updated to version 1.1