Fixes #15 - free accounts support