update
update
update
update
update
update
update
update
update
update
v. 1.0.2
Revert "v. 1.0.2"

This reverts commit b3c236fde83a66018616a04d82053f94594a8e3e.
Merge branch 'develop'

Conflicts:
	R/charge.R