Merge pull request #45 from the12chairs/last_steps

Bugfix
portfolio added
Rules map