fixing
Merge pull request #24 from creighton/master

fixing