Merge pull request #25 from TeamAwesome5u/bos

final merge request with Bos's branch
Merge pull request #27 from TeamAwesome5u/MergeBranch

Merge pull request #25 from TeamAwesome5u/bos