Merge pull request #12 from Karnith/dev

merge
Merge pull request #13 from Karnith/dev

changed url to proper route
Merge pull request #14 from Karnith/master

merge