converted tabs to spaces
converted tabs to spaces, got spec to pass.
merge