Small fixes sent to master, updating dev accordingly #55

Closed z-haiman closed 6 years ago