Merged dev1.2.2 branch
Cleaned up. changed version
cleaned up readme