Merge pull request #4 from Tox/master

Sync with main project
Merge pull request #5 from Tox/master

Sync with main project
Add manpage
Merge pull request #164 from Ansa89/man-page

Add manpage