Merge pull request #1 from Sense-of-Right-Alliance/master

Big stuff
Merge pull request #6 from NarPar/master

Merge pull request #1 from Sense-of-Right-Alliance/master