Latest version with bugfixes

Straight key fix