v7
Merge pull request #20 from CorruptComputer/master

v7