3rd commit
4rd commit
Merge branch 'master' into MicaBranch

Conflicts:
	test.c
Merge pull request #3 from micapat/MicaBranch

Mica branch