Merge pull request #33 from lararennie/label_fixes

Reverting to Java style instead of Android style.