A final edit

There should be merge conflicts now
Merge branch 'patch-4' of https://github.com/keflavich/Testing

Conflicts:
	get_pv_intsmart.pro