stephan v 1.2

lalala
Merge branch 'Test' of https://github.com/G3MemoryCard/Test.git