bug 164 fixes?

[Robert Xu]

Hi all,

Is bug 164/174 getting pushed to master anytime soon? The patch attached in 164 
definitely works.

--
cheers, Robert :: github.com/robxu9