Fixed problem 1 of Ticket #165.  Will fix problem 2 tomorrow.
Fixed problem 1 of Ticket #165.  Will fix problem 2 tomorrow.

eecian/Team08-iPeer,eecian/Team08-iPeer,eecian/Team08-iPeer,eecian/Team08-iPeer