Close #15 with this change. Removed extra payment from principal so its only counted once.