-added option to place labels before or after element
-code cleanup
Merge remote-tracking branch 'origin/master'