Fix #62 - #63 - #64
Bump to 1.0.4
merging upstream changes