manuall merge github issue #229
manual implement Github issue #223
Merge pull request #237 from Atheros1/master

manually merge pull requests