diff --git a/.travis.yml b/.travis.yml
index 306093572..85b500607 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,43 +1,29 @@
 language: c++
 matrix:
   include:
-  - os: linux
-    env: TARGET=ubuntu:16.04
-    sudo: false
-  - os: linux
-    env: TARGET=ubuntu:16.10
-    sudo: false
-  - os: linux
-    env: TARGET=32bit/ubuntu:16.04
-    sudo: false
-  - os: osx
-    env: TARGET=osx
-    osx_image: xcode7.3
   - os: osx
     env: TARGET=ios
-  - os: osx
-    env: TARGET=simulator
   - os: osx
     env: TARGET=androidarm
   - os: osx
     env: TARGET=androidarm64
-  - os: osx
-    env: TARGET=androidx86
 sudo: required
 dist: trusty
 osx_image: xcode8.2
 services:
 - docker
-cache: ccache
+cache:
+  skip_bundle_clean: true
 env:
   global:
   - BUILD_NUMBER=${TRAVIS_BUILD_NUMBER}
   - RUN_TESTS=ALL
   - PATH=${PATH}:$HOME/.local/bin:$HOME/Library/Python/2.7/bin;
   - AWS_DEFAULT_REGION=eu-west-1
-  - secure: VTpLjRFkVZeqSiP/tea7b5WiMU+PjQJlpny8/QEYazRNhn/uie69aT8VvEdkpsUM1AEx8yPnNmVGShvoNNaOi/AoqynTIKgeGPCj44h6lCnPpByGVur0avc5WrRj2xBbPBBUw1rsL65wZ13MufmRLUwnmmVYQZ3qDBdpgZvCEhA=
-
-before_install: if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+  - secure: Vo6CdadGO1qR9D5ax+ZWiw+ztGk6MAsqbqBhS4iuLX+NgKqynWygJlFKErRldpJ2fvVS2oAlO348GuZ54PGNaRU9H1hokKd4VgQtBdqXkkkJH9TkP/JxK27owCt/ZQcSr1/+2LAFLzKMWOsEnnSXojzrVH37lALuOMS6YQ9UfpF3KxYdbaWFsuWc0GF5TADwFSDwGssb/FKb6jIjjU9EcfFbvEPY5v6GkYaum2Zsp8ZpwVX6JqjuSS9+azvJAIsRabM1Vd7uubSYhQtYejuYE2wAFPcx8T460JzdVbMBfjnqxQnWg2eBghAP+CwIEG748kJ1Rtm1gY5X2d5KGK0zZsWIotzaeIHiQroldVQcam+xQ+hXDJOeIk18W02ezg8I6oqySWYamrW253i51vTRtrjxACcZw3hAfPqQCkX6mV7gm05z+7LEFAZIFcezAi8XzmkzdrbGC5jkVnLb3rfHoww6+3udMUUx8vfIMWz2aa/jioyBR0NGHxhB9PEr9KfjjvwwljGC71bmoH6Ik18ttm68NQxlotA3naPOPOFh4lJJh3q9cvc8xid50YWirN0DGpFEi1pq/y4QouMzC3RmWaG2XiCvkRhKDNjt83qYNO+LEF1mydGvFQt+AIJUQ0FGlnilx/Hmjr5182/kWlZF/necI8zfW2mTaf0hU5abkLw=
+before_install: 
+  if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+    rvm get head;
     brew install swig;
     HASH=($(shasum prepare_osx_build_environment.sh));
     pip install --user awscli > /dev/null;
@@ -52,6 +38,12 @@ before_install: if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       fi
     fi
   fi
+
+  if [ "${TARGET}" = "ios" ]; then
+    TARGETTT="iphoneos";
+  else
+    TARGETTT="${TARGET}";
+  fi
 script: case ${TARGET} in
   *ios*|*simulator*)
     cd examples/libdigidocpp-ios && ./build-library.sh ${TARGET} && cd ../..;
@@ -66,7 +58,7 @@ script: case ${TARGET} in
     ;;
   *)
     docker run -e BUILD_NUMBER=${TRAVIS_BUILD_NUMBER} -e DEBFULLNAME="Travis" -e DEBEMAIL="travis-ci@travis" -v $(pwd):$(pwd) -t "${TARGET}" /bin/bash -c "cd $(pwd);"'
-      apt-get update -qq; 
+      apt-get update -qq;
       apt-get install -y dh-make devscripts dpkg-dev cdbs cmake vim-common xsdcxx libxml-security-c-dev libminizip-dev doxygen libboost-test-dev git;
       export VERSION=$(grep project CMakeLists.txt | egrep -o "([0-9]{1,}\.)+[0-9]{1,}").${BUILD_NUMBER};
       dh_make --createorig --addmissing --defaultless -y -p libdigidocpp_${VERSION};
@@ -74,28 +66,27 @@ script: case ${TARGET} in
       dpkg-buildpackage -rfakeroot -us -uc;
       git clean -dxf';
   esac
-
 addons:
   coverity_scan:
     project:
-      name: open-eid/libdigidocpp
-    notification_email: raul@metsma.ee
-    build_command_prepend: mkdir coverity; cd coverity; cmake ..
+      name: jbcode/libdigidocpp
+    notification_email: juozas.bitkevicius@gmail.com
+    build_command_prepend: mkdir coverity_scan; cd coverity_scan; cmake ..
     build_command: make
     branch_pattern: coverity_scan
-
 before_deploy:
 - export VERSION=${TRAVIS_TAG:1}
 - git clean -dfx
 - cd ..
 - mv libdigidocpp libdigidocpp-${VERSION}
-- tar czf libdigidocpp-${VERSION}.tar.gz --exclude-vcs libdigidocpp-${VERSION}
+- tar czf libdigidocpp-${VERSION}-${TARGETTT}.tar.gz libdigidocpp-${VERSION} /Library/EstonianIDCard.${TARGETTT}
 deploy:
   provider: releases
   api_key:
-    secure: CXl5yp2RQ1VpUWU3j8hsTrQ38TwShaUSIQoAAfHjEdMZvk5GAR0JFzrswpE2AWOEEDHsQV+66DHydqAnv4fYQlAZdXSc44PlNiIC3LV15sVdtoLLZhFBM/UWxDJ1tPMeU654d/SUeXWLd3CMHMrbOEyUA+ymUR1icmc8xHNGqpo=
-  file: libdigidocpp-${VERSION}.tar.gz
+    secure: cdIEyrX4J/3GtHLj+1fGXXstklVk/UiubbgQmyuuI/VV38zWSFd9pw1/1DCm+DVIvog57ymmL4xVJQFitqSroEcRGXOyPm9I2oQ4b/MEA74eij0MuG54fAHLp7gGS/qUhYBp8NxHYoedQM4hhaKgSwA1T20TH8wfIu6KUXpCWzR/6CGTnQjPRXnnNcd3xAdacBYF0i7Z8QxnL/YlCdITAZtQyNveUYBA2z7Vqq9VTxfzWfYu1q6sukkXzc/hlHQoTGjZU1EnZifBMK+pMNIQOTsb1wdVkHJCEUVqN5DqI3j/YSY5AnOkGjCwPsUWcOrW7BPMBoeT8S2NqN1EESR8dW9VfQgzaNoFdzTaL7Yo7fl4iJvoHaf5uJOgZ1zsKXI/w7pMmgDs4W4bFRfqtha6Fz0YjFtCHTUZhTUWCvLU2gKCCTUSxpWoGlGKg2V1UH7XOIvz8eFRQKzqLryDGIojkXaqwBjlOJhVYcguO0fcFjTqpm1yAbJM4FwuNSU80H755lWA1IsKFQGZ3PaQjK3YGFP8zSiZKtOK44NtgpRvwcpcbJX8IkZ/eL3N4XE4X2nDltqxyUTfqe9iOUEiqBb461sYVuv5XLrn0cKDqQn336r0ESUj5mVQO5RVUT2ZFDjXVBaJMtotwkV07WJqOm2t8u2wJNYFC7ukPn4V8HiKtVs=
+  file: libdigidocpp-${VERSION}-${TARGETTT}.tar.gz
   skip_cleanup: true
   on:
+    repo: jbcode/libdigidocpp
     tags: true
-    condition: "$TRAVIS_OS_NAME = linux"
+    all_branches: true
diff --git a/src/SignatureXAdES_B.cpp b/src/SignatureXAdES_B.cpp
index b0188ebdd..ad34fb922 100644
--- a/src/SignatureXAdES_B.cpp
+++ b/src/SignatureXAdES_B.cpp
@@ -1168,8 +1168,8 @@ X509Cert SignatureXAdES_B::signingCertificate() const
     const X509DataType::X509CertificateSequence& x509CertSeq = x509DataSeq.front().x509Certificate();
     if(x509CertSeq.empty())
         THROW("Signature does not contain signer certificate");
-    else if(x509CertSeq.size() != 1)
-        THROW("Signature contains more than one signers certificate");
+//    else if(x509CertSeq.size() != 1)
+//        THROW("Signature contains more than one signers certificate");
     try
     {
         const X509DataType::X509CertificateType& data = x509CertSeq.back();