improve the design a little bit
Merge branch 'master' of github.com:cseslam/stallion