fixes #11, #13
Merge branch 'develop' of https://github.com/TruffleMuffin/Decisions into develop