Add subject resolution
Incorporate feedback by @Ocramius
Merge pull request #1 from Bacon/feature/resolution

Add subject resolution