Merge pull request #3 from myrlen/develop

Changing all proportional charges to be expressed in percentage point…