two problem fixed.
Merge pull request #131 from yogpstop/bugFix

two problem fixed.