Merge pull request #1 from isnotnil/feature/spirits

Feature/spirits