Solved 19-24
Merge pull request #17 from krisvage/rest

Solved 19-24