Merge pull request #4 from tkrille/master

Fixing GitHub Issue #1
Merge pull request #8 from tkrille/master

fixing issue #1 for other controllers
Merge pull request #10 from tkrille/master

Fixing GitHub Issue #5