main feature finished.
Merge branch 'dev'

Conflicts:
	main.py
update to rewrite version