Fixed a bug
Merge branch 'master' into version2