Resolve Issue 826 (pt 1)
Resolve Issue 826 (pt 2)
Merge pull request #95 from 602p/master

Resolve Issue 826