Merge pull request #101 from hoter/small

Small changes