Merge employee-by-user-1, close #36

Need to merge employee-by-user-1 branch, it closes #36