Added labels. Refactored. Incremented version.