temp
Copied raw from github - didn't want to solve merge problems by hand
Fixed compatibility problem with windows TeXworks