Merge pull request #174 from dubek/issue_166_schemes