Changes to issues 316 and 372
Changes to issues 316 and 372
Merge pull request #401 from gabe283/master

Issues 372 and 316 with changes