small improvements
Merge pull request #134 from sacjaya/master

small improvements