added #472 and #473
fixed #485
Merge pull request #485 from MarcBook/master

Closes #472 and #473.