Merge pull request #7 from myrlen/develop

Updating from mifosio