fixing typoes
tagged version 1.2
merged changes