Replace tabs with spaces
Set timeout more then asterisk timeout, otherwise there will be an exception
Merge pull request #1 from kubum/master

Merging fork commits