manually merge #431
Merge pull request #456 from Atheros1/master

manually merge #431