Fix comments
Add number generator (issue #2)