Bug fixed in first release
Merging master and team1
Team 1 completed release