Updating logic in controller to support Kohana 3.3 integration.
Merge branch 'release/0.1.1'