Resolves #48

Add necessary changes to pass roslint.