Version 0.9.5

Working!
Just needed some fixes