issue #232, clear the concepts
Merge pull request #203 from andyque/master

issue #232, clear the concepts