Issue/007/issue seven

fix #7