solved issues - resolve #11