Fix #506
Cleanup
Merge pull request #746 from sklam/fix506

Fix #506