Merged pull request #7
Merge branch '2.1'
Update composer stable version of 2.1.x branch.
Merge branch '2.1'