Reworking usage information. fixes #15