Nakiami/mellivora — pull request #26 by cyberdash (2014-09-20 12:58:21+00:00)
Title: Issue 1+2

If you want both Issue 1 and Issue 2 without merge conflicts, merge this one and decline the other two