Added new options for parts
Routine commit
Cleaned up code
Updated README
Merge branch 'develop'

Conflicts:
	README.md