Merge pull request #462 from di2e/master

Master
Merge pull request #463 from dshurt/master

Merge pull request #462 from di2e/master