fixed typo and merged changes