1.0.7

Fixing issues from funky commit