Fixed remaining subjects Fixes #7 Closes #7