project_0.6

bugfixed