Changed variable names which fixes #41.