fix issue 1 by detecting fixed charges and handling them properly
Merge pull request #5 from andersje/better_issue1_fix

fix issue 1 by detecting fixed charges and handling them properly