Documentation updated
Identation fixed
Country creation fixed
Merge remote-tracking branch 'origin/cleanup' into cleanup