Updated usage messages in source and man file
Significantly shortened code

The code has been significantly shortened.
Merge pull request #20 from aliclubb/develop

Merge develop into master