Error fix

and future request )
Error fix
last fix )
full fix

corrected all - the old version of painful to watch
Merge pull request #334 from WinterSilence/2.0.5

Error Fix