update from classified-magic 0.1.1