added time evaluation
Merge branch 'master' of github.com:shager/mojito