Fixes #584
Merge pull request #600 from netantho/netantho-584

Fixes #584