Merge pull request #656 from cssquirrel/1.2.0

1.2.0