some fix & changes
version 0.1.4