Fix #181 and close #174.
Fix #177 and fix #172.
Release 3.0.4
Release 3.0.4