Merge pull request #121 from KyleW/master

merged tom's stuff with mike's stuff