new resolution, and some new methods
Broken pipe fixed + concurrentmodificationexception
not sure what is different right now
fixed merged conflicts
Merge pull request #4 from runeandersen92/feature/resolution+otherMethods

Merged JP's Feature/resolution+other methods branch