Updates for 1.2
Merge pull request #3 from elfinlazz/master

Updates for 1.2