Merge pull request #291 from EricWittmann/master

Minor bug fixes.
Merge pull request #292 from EricWittmann/master

Typo/bug fix in SY deriver.