Merge pull request #17 from eas604/master

fixes
bughunt
Merge pull request #24 from TEAM2-ISC567-FALL14/master

bughunt