removed old resolvers
fixed commit
Updated version and changes
Merge remote-tracking branch 'origin/master'