Issue blacklocus/blacklocus#741

Creating pull request for emma's additions. Also figuring out if this is how you pull request to a fork.