Issue #313 #314 #262 were fixed. Conflicts was resolved.