diff --git a/data-raw/Austria_Census.xlsx b/data-raw/Austria_Census.xlsx
index 308b8e3a7e3afa82ba504f2c8142952727a05490..6aa351ecd67dd279f67761d3516c27385735fc18 100644
Binary files a/data-raw/Austria_Census.xlsx and b/data-raw/Austria_Census.xlsx differ
diff --git a/inst/extdata/Austria_Census_Unisex.csv b/inst/extdata/Austria_Census_Unisex.csv
new file mode 100644
index 0000000000000000000000000000000000000000..c39b2a6f09caba776b0ad5cf8ae28e1aa3617495
--- /dev/null
+++ b/inst/extdata/Austria_Census_Unisex.csv
@@ -0,0 +1,117 @@
+Census-Mortality Tables Austrian Unisex
+Source: Statistik Austria. Alexander Hanika
+
+x;1868/71;1879/82;1889/92;1899/1902;1909/12;1930/33;1949/51;1959/61;1970/72;1980/82;1990/92;2000/02;2010/12
+0;;;;;;;;;;;;;0.003562
+1;;;;;;;;;;;;;0.000231
+2;;;;;;;;;;;;;0.000184
+3;;;;;;;;;;;;;0.000143
+4;;;;;;;;;;;;;0.000110
+5;;;;;;;;;;;;;0.000086
+6;;;;;;;;;;;;;0.000073
+7;;;;;;;;;;;;;0.000069
+8;;;;;;;;;;;;;0.000070
+9;;;;;;;;;;;;;0.000071
+10;;;;;;;;;;;;;0.000073
+11;;;;;;;;;;;;;0.000081
+12;;;;;;;;;;;;;0.000096
+13;;;;;;;;;;;;;0.000120
+14;;;;;;;;;;;;;0.000158
+15;;;;;;;;;;;;;0.000210
+16;;;;;;;;;;;;;0.000272
+17;;;;;;;;;;;;;0.000341
+18;;;;;;;;;;;;;0.000410
+19;;;;;;;;;;;;;0.000469
+20;;;;;;;;;;;;;0.000509
+21;;;;;;;;;;;;;0.000528
+22;;;;;;;;;;;;;0.000525
+23;;;;;;;;;;;;;0.000509
+24;;;;;;;;;;;;;0.000492
+25;;;;;;;;;;;;;0.000481
+26;;;;;;;;;;;;;0.000474
+27;;;;;;;;;;;;;0.000471
+28;;;;;;;;;;;;;0.000470
+29;;;;;;;;;;;;;0.000475
+30;;;;;;;;;;;;;0.000486
+31;;;;;;;;;;;;;0.000503
+32;;;;;;;;;;;;;0.000526
+33;;;;;;;;;;;;;0.000555
+34;;;;;;;;;;;;;0.000591
+35;;;;;;;;;;;;;0.000631
+36;;;;;;;;;;;;;0.000675
+37;;;;;;;;;;;;;0.000724
+38;;;;;;;;;;;;;0.000782
+39;;;;;;;;;;;;;0.000849
+40;;;;;;;;;;;;;0.000931
+41;;;;;;;;;;;;;0.001032
+42;;;;;;;;;;;;;0.001152
+43;;;;;;;;;;;;;0.001292
+44;;;;;;;;;;;;;0.001452
+45;;;;;;;;;;;;;0.001630
+46;;;;;;;;;;;;;0.001828
+47;;;;;;;;;;;;;0.002045
+48;;;;;;;;;;;;;0.002283
+49;;;;;;;;;;;;;0.002542
+50;;;;;;;;;;;;;0.002823
+51;;;;;;;;;;;;;0.003125
+52;;;;;;;;;;;;;0.003455
+53;;;;;;;;;;;;;0.003814
+54;;;;;;;;;;;;;0.004208
+55;;;;;;;;;;;;;0.004643
+56;;;;;;;;;;;;;0.005129
+57;;;;;;;;;;;;;0.005664
+58;;;;;;;;;;;;;0.006246
+59;;;;;;;;;;;;;0.006875
+60;;;;;;;;;;;;;0.007543
+61;;;;;;;;;;;;;0.008243
+62;;;;;;;;;;;;;0.008957
+63;;;;;;;;;;;;;0.009696
+64;;;;;;;;;;;;;0.010449
+65;;;;;;;;;;;;;0.011218
+66;;;;;;;;;;;;;0.012009
+67;;;;;;;;;;;;;0.012872
+68;;;;;;;;;;;;;0.013840
+69;;;;;;;;;;;;;0.014917
+70;;;;;;;;;;;;;0.016150
+71;;;;;;;;;;;;;0.017572
+72;;;;;;;;;;;;;0.019231
+73;;;;;;;;;;;;;0.021182
+74;;;;;;;;;;;;;0.023447
+75;;;;;;;;;;;;;0.026103
+76;;;;;;;;;;;;;0.029200
+77;;;;;;;;;;;;;0.032853
+78;;;;;;;;;;;;;0.037141
+79;;;;;;;;;;;;;0.042084
+80;;;;;;;;;;;;;0.047756
+81;;;;;;;;;;;;;0.054211
+82;;;;;;;;;;;;;0.061523
+83;;;;;;;;;;;;;0.069640
+84;;;;;;;;;;;;;0.078587
+85;;;;;;;;;;;;;0.088520
+86;;;;;;;;;;;;;0.099541
+87;;;;;;;;;;;;;0.112010
+88;;;;;;;;;;;;;0.125804
+89;;;;;;;;;;;;;0.140964
+90;;;;;;;;;;;;;0.157392
+91;;;;;;;;;;;;;0.175061
+92;;;;;;;;;;;;;0.193823
+93;;;;;;;;;;;;;0.213746
+94;;;;;;;;;;;;;0.234421
+95;;;;;;;;;;;;;0.256099
+96;;;;;;;;;;;;;0.278709
+97;;;;;;;;;;;;;0.301820
+98;;;;;;;;;;;;;0.325508
+99;;;;;;;;;;;;;0.349389
+100;;;;;;;;;;;;;1.000000
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
diff --git a/inst/extdata/MortalityTables_Austria_Census.R b/inst/extdata/MortalityTables_Austria_Census.R
index 94cfe9f889b5fc6319f27e729d66114f4d658128..152f0075094657a513a9c3921a9ec3162c46d7d0 100644
--- a/inst/extdata/MortalityTables_Austria_Census.R
+++ b/inst/extdata/MortalityTables_Austria_Census.R
@@ -7,10 +7,11 @@ stopifnot(require(methods), require(utils), require(MortalityTables)) # Mortalit
 
 
 a.vz.dataM = utils::read.csv(system.file("extdata", "Austria_Census_Male.csv", package = "MortalityTables"), skip = 3);
-a.vz.dataF = utils::read.csv(system.file("extdata", "Austria_Census_Female.csv", package="MortalityTables"), skip = 3);
+a.vz.dataF = utils::read.csv(system.file("extdata", "Austria_Census_Female.csv", package = "MortalityTables"), skip = 3);
+a.vz.dataU = utils::read.csv(system.file("extdata", "Austria_Census_Unisex.csv", package = "MortalityTables"), skip = 3);
 
-censtable = function(data, name, qslot, baseYear=1900, sex = "m") {
-  qx = data[names(data) == qslot];
+censtable = function(data, name, qslot, baseYear = 1900, sex = "m") {
+  qx = data[names(data) = = qslot];
   ix = complete.cases(qx);
   mortalityTable.period(name = name, ages = data$x[ix], deathProbs = qx[ix,], baseYear = baseYear,
       data = list(
@@ -19,39 +20,40 @@ censtable = function(data, name, qslot, baseYear=1900, sex = "m") {
   )
 }
 
-mort.AT.census.1869.male = censtable(a.vz.dataM, name="ÖVSt 1868/71 M",   baseYear=1869, qslot="X1868.71", sex = "m")
-mort.AT.census.1880.male = censtable(a.vz.dataM, name="ÖVSt 1879/82 M",   baseYear=1880, qslot="X1879.82", sex = "m")
-mort.AT.census.1890.male = censtable(a.vz.dataM, name="ÖVSt 1889/92 M",   baseYear=1890, qslot="X1889.92", sex = "m")
-mort.AT.census.1900.male = censtable(a.vz.dataM, name="ÖVSt 1899/1902 M", baseYear=1900, qslot="X1899.1902", sex = "m")
-mort.AT.census.1910.male = censtable(a.vz.dataM, name="ÖVSt 1909/12 M",   baseYear=1910, qslot="X1909.12", sex = "m")
-mort.AT.census.1931.male = censtable(a.vz.dataM, name="ÖVSt 1930/33 M",   baseYear=1931, qslot="X1930.33", sex = "m")
-mort.AT.census.1951.male = censtable(a.vz.dataM, name="ÖVSt 1949/51 M",   baseYear=1951, qslot="X1949.51", sex = "m")
-mort.AT.census.1961.male = censtable(a.vz.dataM, name="ÖVSt 1959/61 M",   baseYear=1961, qslot="X1959.61", sex = "m")
-mort.AT.census.1971.male = censtable(a.vz.dataM, name="ÖVSt 1970/72 M",   baseYear=1971, qslot="X1970.72", sex = "m")
-mort.AT.census.1981.male = censtable(a.vz.dataM, name="ÖVSt 1980/82 M",   baseYear=1981, qslot="X1980.82", sex = "m")
-mort.AT.census.1991.male = censtable(a.vz.dataM, name="ÖVSt 1990/92 M",   baseYear=1991, qslot="X1990.92", sex = "m")
-mort.AT.census.2001.male = censtable(a.vz.dataM, name="ÖVSt 2000/02 M",   baseYear=2001, qslot="X2000.02", sex = "m")
-mort.AT.census.2011.male = censtable(a.vz.dataM, name="ÖVSt 2010/2012 M", baseYear=2011, qslot="X2010.12", sex = "m")
+mort.AT.census.1869.male = censtable(a.vz.dataM, name = "ÖVSt 1868/71 M",   baseYear = 1869, qslot = "X1868.71", sex = "m")
+mort.AT.census.1880.male = censtable(a.vz.dataM, name = "ÖVSt 1879/82 M",   baseYear = 1880, qslot = "X1879.82", sex = "m")
+mort.AT.census.1890.male = censtable(a.vz.dataM, name = "ÖVSt 1889/92 M",   baseYear = 1890, qslot = "X1889.92", sex = "m")
+mort.AT.census.1900.male = censtable(a.vz.dataM, name = "ÖVSt 1899/1902 M", baseYear = 1900, qslot = "X1899.1902", sex = "m")
+mort.AT.census.1910.male = censtable(a.vz.dataM, name = "ÖVSt 1909/12 M",   baseYear = 1910, qslot = "X1909.12", sex = "m")
+mort.AT.census.1931.male = censtable(a.vz.dataM, name = "ÖVSt 1930/33 M",   baseYear = 1931, qslot = "X1930.33", sex = "m")
+mort.AT.census.1951.male = censtable(a.vz.dataM, name = "ÖVSt 1949/51 M",   baseYear = 1951, qslot = "X1949.51", sex = "m")
+mort.AT.census.1961.male = censtable(a.vz.dataM, name = "ÖVSt 1959/61 M",   baseYear = 1961, qslot = "X1959.61", sex = "m")
+mort.AT.census.1971.male = censtable(a.vz.dataM, name = "ÖVSt 1970/72 M",   baseYear = 1971, qslot = "X1970.72", sex = "m")
+mort.AT.census.1981.male = censtable(a.vz.dataM, name = "ÖVSt 1980/82 M",   baseYear = 1981, qslot = "X1980.82", sex = "m")
+mort.AT.census.1991.male = censtable(a.vz.dataM, name = "ÖVSt 1990/92 M",   baseYear = 1991, qslot = "X1990.92", sex = "m")
+mort.AT.census.2001.male = censtable(a.vz.dataM, name = "ÖVSt 2000/02 M",   baseYear = 2001, qslot = "X2000.02", sex = "m")
+mort.AT.census.2011.male = censtable(a.vz.dataM, name = "ÖVSt 2010/2012 M", baseYear = 2011, qslot = "X2010.12", sex = "m")
 
-mort.AT.census.1869.female = censtable(a.vz.dataF, name="ÖVSt 1868/71 F",   baseYear=1869, qslot="X1868.71", sex = "w")
-mort.AT.census.1880.female = censtable(a.vz.dataF, name="ÖVSt 1879/82 F",   baseYear=1880, qslot="X1879.82", sex = "w")
-mort.AT.census.1890.female = censtable(a.vz.dataF, name="ÖVSt 1889/92 F",   baseYear=1890, qslot="X1889.92", sex = "w")
-mort.AT.census.1900.female = censtable(a.vz.dataF, name="ÖVSt 1899/1902 F", baseYear=1900, qslot="X1899.1902", sex = "w")
-mort.AT.census.1910.female = censtable(a.vz.dataF, name="ÖVSt 1909/12 F",   baseYear=1910, qslot="X1909.12", sex = "w")
-mort.AT.census.1931.female = censtable(a.vz.dataF, name="ÖVSt 1930/33 F",   baseYear=1931, qslot="X1930.33", sex = "w")
-mort.AT.census.1951.female = censtable(a.vz.dataF, name="ÖVSt 1949/51 F",   baseYear=1951, qslot="X1949.51", sex = "w")
-mort.AT.census.1961.female = censtable(a.vz.dataF, name="ÖVSt 1959/61 F",   baseYear=1961, qslot="X1959.61", sex = "w")
-mort.AT.census.1971.female = censtable(a.vz.dataF, name="ÖVSt 1970/72 F",   baseYear=1971, qslot="X1970.72", sex = "w")
-mort.AT.census.1981.female = censtable(a.vz.dataF, name="ÖVSt 1980/82 F",   baseYear=1981, qslot="X1980.82", sex = "w")
-mort.AT.census.1991.female = censtable(a.vz.dataF, name="ÖVSt 1990/92 F",   baseYear=1991, qslot="X1990.92", sex = "w")
-mort.AT.census.2001.female = censtable(a.vz.dataF, name="ÖVSt 2000/02 F",   baseYear=2001, qslot="X2000.02", sex = "w")
-mort.AT.census.2011.female = censtable(a.vz.dataF, name="ÖVSt 2010/2012 F", baseYear=2011, qslot="X2010.12", sex = "w")
+mort.AT.census.1869.female = censtable(a.vz.dataF, name = "ÖVSt 1868/71 F",   baseYear = 1869, qslot = "X1868.71", sex = "w")
+mort.AT.census.1880.female = censtable(a.vz.dataF, name = "ÖVSt 1879/82 F",   baseYear = 1880, qslot = "X1879.82", sex = "w")
+mort.AT.census.1890.female = censtable(a.vz.dataF, name = "ÖVSt 1889/92 F",   baseYear = 1890, qslot = "X1889.92", sex = "w")
+mort.AT.census.1900.female = censtable(a.vz.dataF, name = "ÖVSt 1899/1902 F", baseYear = 1900, qslot = "X1899.1902", sex = "w")
+mort.AT.census.1910.female = censtable(a.vz.dataF, name = "ÖVSt 1909/12 F",   baseYear = 1910, qslot = "X1909.12", sex = "w")
+mort.AT.census.1931.female = censtable(a.vz.dataF, name = "ÖVSt 1930/33 F",   baseYear = 1931, qslot = "X1930.33", sex = "w")
+mort.AT.census.1951.female = censtable(a.vz.dataF, name = "ÖVSt 1949/51 F",   baseYear = 1951, qslot = "X1949.51", sex = "w")
+mort.AT.census.1961.female = censtable(a.vz.dataF, name = "ÖVSt 1959/61 F",   baseYear = 1961, qslot = "X1959.61", sex = "w")
+mort.AT.census.1971.female = censtable(a.vz.dataF, name = "ÖVSt 1970/72 F",   baseYear = 1971, qslot = "X1970.72", sex = "w")
+mort.AT.census.1981.female = censtable(a.vz.dataF, name = "ÖVSt 1980/82 F",   baseYear = 1981, qslot = "X1980.82", sex = "w")
+mort.AT.census.1991.female = censtable(a.vz.dataF, name = "ÖVSt 1990/92 F",   baseYear = 1991, qslot = "X1990.92", sex = "w")
+mort.AT.census.2001.female = censtable(a.vz.dataF, name = "ÖVSt 2000/02 F",   baseYear = 2001, qslot = "X2000.02", sex = "w")
+mort.AT.census.2011.female = censtable(a.vz.dataF, name = "ÖVSt 2010/2012 F", baseYear = 2011, qslot = "X2010.12", sex = "w")
 
-mort.AT.census.2001.unisex = mortalityTable.mixed(table1=mort.AT.census.2001.male, table2=mort.AT.census.2001.female,
+mort.AT.census.2001.unisex = mortalityTable.mixed(table1 = mort.AT.census.2001.male, table2 = mort.AT.census.2001.female,
     data = list(
         dim = list(sex = "u", collar = "Gesamtbevölkerung", type = "Volkssterbetafel Österreich", data = "official", year = 2001)
     )
 )
+mort.AT.census.2011.unisex = censtable(a.vz.dataU, name = "ÖVSt 2010/2012 U", baseYear = 2011, qslot = "X2010.12", sex = "u")
 
 mort.AT.census.ALL.male = MortalityTables::makeQxDataFrame(
               mort.AT.census.1869.male,
@@ -87,6 +89,6 @@ rm(a.vz.dataM, a.vz.dataF, censtable)
 
 ###############################################################################
 
-# plot(mort.AT.census.ALL.male, title="Vergleich österreichische Sterbetafeln, Männer", legend.position=c(1,0))
-# plot(mort.AT.census.ALL.female, title="Vergleich österreichische Sterbetafeln, Frauen", legend.position=c(1,0))
+# plot(mort.AT.census.ALL.male, title = "Vergleich österreichische Sterbetafeln, Männer", legend.position = c(1,0))
+# plot(mort.AT.census.ALL.female, title = "Vergleich österreichische Sterbetafeln, Frauen", legend.position = c(1,0))