joined two project, updated to version 0.11
modified files