Merge pull request #25 from TeamAwesome5u/bos

final merge request with Bos's branch