Added simpler import. Closes #26