caching results
improved fatal error messages
small improvements
Merge remote-tracking branch 'origin/master'