Merge pull request #8 from alcatrazia/master

Fixing bugs
Writing the usage documentation
Merge remote-tracking branch 'upstream/master'
Editing docs