Update and fix

Merged patch-1 from wiox repo and fixed issue #7