API refactor
review fix
Merge pull request #259 from spawluk-bitbar/devel

API refactor