Updated to r26
Merge pull request #6 from dky/master

Updated to r26