updated on 10/7

merging blr branch to master branch