Update 0.2.2

Full support 1.6.4, New features, Cleanup, Bug fixes