added support for 2d6 type notation, updated test, updated sample data