armon Merge pull request #14 from stbuehler/feature-without-resolve