fixes #71 #75

Closed tomasharkema closed 8 years ago