Merge pull request #20 from bungao/master

further merged optimizations, added labels
replaced : with ;