Added missing requirements detailed in #1 and #2.