Convert source code to 1.6
Merge rnc's changes for fixing #18
Merge branch 'rnc-master'