Update DocBlocks
Re-Arrange Keywords
Add changelog for version 1.2.1