fixed nasty bugs
Merge pull request #21 from salter31/software-testing

fixed nasty bugs