Fix #175

Seems to pass tests, lets see what Travis and AppVeyor say. 
Everyone happy with the new aesthetics?