Updated to 1.3.0
Added support for different entity styles (upper, hyphen comment)
Improved documentation
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md