Merge PR upstream
Merge pull request #15 from faizkhan00/tomas-2-sp

Need to clean up controller