Merge pull request #222 from Maatwebsite/1.2

1.2.1