extend API and resolve broken unit test
Merge branch 'master' of github.com:arq5x/gemini