fixing
Merge pull request #25 from creighton/master

fixing