updated for 1.2 release
Merge pull request #1 from a1dutch/master

updated for 1.2 release