Merge pull request #597 from aesedepece/dev

Fix #596