Small updates; bumped __version__ on master