Merged dev1.2 into development
Cleaned up. changed version