fix issue #1 and fix issue #2
Merge branch 'master' of https://github.com/f22raptorfire/Milestone-2-Part-A