Still dealing with borked scope_guard commit
Merge pull request #11 from rodgert/master

Still dealing with borked scope_guard commit