Fix issue #31
Merge branch '31_keyring' into dev

Conflicts:
	lib/core.sh