Added more functionality and a few fixes( Also Python-Script)

Win7