This commit solves #3