Apply basic patch
Merge pull request #1 from normai/dev-multi

Apply basic patch