Version 0.8.0.9 - Almost finished