Update comment
Implement #38