Merge pull request #7 from MatStep/test

subor2
subor3
Update subor3
Update subor2
Merge pull request #8 from MatStep/master

fork