merge conflict
test 7
undo mctest
Merge pull request #18 from Raynos/master

test 7