Some cool change! Fixes #3