Merge pull request #382 from EricWittmann/master

Two issues fixed (see details)