added handling for labels
Merge branch 'master' of https://github.com/thaider/tweeki