Upating for official release ( thanks beta testers !!! )
Merge remote-tracking branch 'origin/master' into stable