some small changes
Merge pull request #998 from ghtmtt/master

some small changes