big bugfix, regexp improvement
Merge branch 'master' of github.com:somasonic/RServ
rm TODO