Fixes #1 Support for user-specified keys
Merge branch 'master' of github.com:redjack/FTE