Merge pull request #93 from phuonghuynh/master

R9 improvements