Merge pull request #14 from sh4nks/develop

Added new features and fixed a few bugs
Merge pull request #15 from sh4nks/develop

Added some docs.
I should have checked the template too..