Made out of memory exception more informative.
Merge branch 'master' of github.com:hetelek/Velocity