Dev updated to 0.2.1
Merge branch 'Dev'

Conflicts:
	test_file.txt