new version (0.3.01)
fixed some merging related commits