Fixes #1 error
Fixes #2 error. Some requirements were added.