Probably finalize Github issue 94 fix
Merge pull request #98 from Atheros1/master

Probably finalize Github issue 94 fix