better errors gem
Merge branch 'Adar'