Merge pull request #375 from BuracayBeach/team1/bugfixing

Team1/bugfixing