Added some feature.
close #2