TC-460 implemented
Merge pull request #64 from spawluk-bitbar/devel

TC-460 implemented