Added more. Fixes #1

Added more. Fixes #1