Added support for displaying type of class in header + some tiny fixes(master)

See pull request #194