Fixes #2 by juho-jaakkola