merged idea of issue #98 and #106 by gittex (Dominik Schulz)
Merge branch '0.40' of github.com:krimdomu/Rex into 0.40