Fixes #69
Merge remote-tracking branch 'remotes/origin/Issue_69'

Conflicts:
	RUIANServices/services/config.py