Merge pull request #21 from datanium/master

pull
row/column convert bug fix
Merge pull request #221 from benitoro/master

row/column convert bug fix