Merge pull request #8 from Crysco/Crys'-Branch

Crys' branch
Merge pull request #11 from Crysco/master

Testing. Testing