Changes:
    Fixes #2