Minor code changes, and readme update. #12