integrated rowClass and rowId
fixed custom classes and ids
Merge pull request #36 from Chumper/develop

Merge develop with master branch