Commit 40 (Beta Candidate)
Fix for #202