Merge pull request #8 from sdatla/master

fixed positioning of labels/added more
more labels