testing code - unstable
Merge pull request #48 from Jonty800/master

testing code - unstable