Fixed #14

:shipit: