Merge pull request #167 from adamarla/master

Added controller action
- Fixed nil reference error