user control
fix tests
Merge pull request #38 from louridas/master

user control