Merge pull request #23 from TeamAwesome5u/bos

Updating Louis' code