old changes in hotfix-0.0.2 branch
Merge branch 'hotfix-0.0.2'

Conflicts:
	rvic/history.py
	rvic/variables.py
	rvic_model.py