Updated according 20 May - 2.1RC1
Merge pull request #124 from gaich/patch-1

Updated according 20 May - 2.1RC1