Changes to handle scheming
Merge pull request #70 from thriuin/wet4-scheming

Changes to handle scheming