Merge pull request #10 from WesThompson/master

Tests
commit
commit
Merge branch 'WorkingBranch' into masterFork

Conflicts:
	Satsuma.v12.suo