Merge pull request #148 from wade1012/dev

Dev Wade
fix compile problem.
Merge pull request #149 from forumbyr/master

fix compile problem.
Merge pull request #21 from cnnic/dev

Dev