Fixed #18
5 files changed