Jan/leading underscores

Prefixing all ivars with underscore. 

This should close Issue #117.