Issues/clean temp

Try merging on github itself...