Master

fixes #303