Issue #4: Some corrections about the coding way