Merge pull request #906 from anarcat/modes