Merge branch 'trunk' into 1.2
Merge pull request #5 from serumax/1.2

1.2