Resolved inssue #7