Merge pull request #136 from gotoalberto/feesfix

Add support for fees