Merge pull request #9 from danholevoet/master

Make @Api definition consistent across classes