fixed reserved, etc
Merge pull request #34 from BuracayBeach/team2_v1.5

fixed reserved, etc