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

Big stuff