Cleanup and add collection annotation
Various cleanups
Clean controller
Refactor options
Update dependencies
Update doc
Solve conflicts
Merge pull request #37 from bakura10/route-cleanup

Cleanup and add collection annotation