Pending auras refactor (Fix issue #14)

:x: forgot (again!) to commit and merge the changes.
therefore, commits due to branch test-suite-check leaked here