Added some minor changes
Merge branch 'master' of github.com:davsuss/ECE-4534