added time limit
Merge branch 'master' of github.com:Pjchardt/PinkElephant