Merge pull request #92 from phuonghuynh/master

Some improvements on R9