diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5cd2992
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/vendor
+composer.lock
+/Certificates.p12
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..d983c76
--- /dev/null
+++ b/README.md
@@ -0,0 +1,55 @@
+# PHP Passkit class for iOS Wallet
+This class provides the functionality to create a pass for Wallet in Apple's iOS 6 and newer on-the-fly. It creates, signs and packages the Pass as a .pkpass file according to Apple's documentation.
+
+## Requirements
+* PHP 5.4 or higher
+* PHP [ZIP Support](http://php.net/manual/en/book.zip.php) (may be installed by default)
+* Access to filesystem (script must be able to create temporary folders)
+
+
+## Installation
+#### Composer
+Run: `$ composer require pkpass/pkpass`
+
+or add to your composer.json: `"pkpass/pkpass": "^1.0.0"`
+
+#### Manual
+Require PKPass.php file in your php files `require('src/PKPass.php');`
+
+
+## Usage
+Please take a look at the example.php file for example usage. For more info on the JSON for the pass and how to style it, take a look at the [docs at developers.apple.com](https://developer.apple.com/library/ios/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/Introduction.html).
+
+### Requesting the Pass Certificate
+1. Go to the [iOS Provisioning portal](https://developer.apple.com/account/ios/identifier/passTypeId).
+2. Create a new Pass Type ID, and write down the Pass ID you choose, you'll need it later.
+3. Click the edit button under your newly created Pass Type ID and generate a certificate according to the instructions shown on the page.
+4. Download the .cer file and drag it into Keychain Access.
+5. Find the certificate you just imported and click the triangle on the left to reveal the private key.
+6. Select both the certificate and the private key under it, then right click the certificate in Keychain Access and choose `Export 2 items…`.
+6. Choose a password and export the file to a folder.
+
+### Getting the example.php sample to work
+1. Request the Pass certificate (`.p12`) as described above and upload it to your server.
+2. Set the correct path and password on [line 22](examples/example.php#L22).
+3. Change the `passTypeIdentifier` and `teamIndentifier` to the correct values on lines [29](examples/example.php#L29) and [31](examples/example.php#L31) (`teamIndentifier` can be found on the [Developer Portal](https://developer.apple.com/account/#/membership)).
+
+After completing these steps, you should be ready to go. Upload all the files to your server and navigate to the address of the examples/example.php file on your iPhone.
+
+
+## Included demos
+* [Simple example](examples/example.php)
+* [Flight ticket example](examples/full_sample/), also [online here](pkpass.dev.scholica.com/examples/full_sample/)
+* [Starbucks card example](examples/starbucks_sample/), also [online here](pkpass.dev.scholica.com/examples/starbucks_sample/)
+
+
+## Debugging passes
+If you aren't able to open your pass on an iPhone, plug the iPhone into a Mac and open the 'Console' application. On the left, you can select your iPhone. You will then be able to inspect any errors that occur while adding the pass:
+
+![Console with Passkit error](https://s3-eu-west-1.amazonaws.com/tsfil/Screen-Shot-2017-04-29-01-32-14-SrVhh/Screen-Shot-2017-04-29-01-32-14.png)
+
+
+## Support & documentation
+Please read the instructions above and consult the [Passbook Documentation](https://developer.apple.com/passbook/) before submitting tickets or requesting support. It might also be worth to [check Stackoverflow](http://stackoverflow.com/search?q=%22PHP-PKPass%22), which contains quite a few questions about this library.
+
+Email me at thomas [at] scholica.com or tweet me [@tschoffelen](http://www.twitter.com/tschoffelen).
\ No newline at end of file
diff --git a/composer.json b/composer.json
index d66fb9d..fd5bced 100644
--- a/composer.json
+++ b/composer.json
@@ -1,23 +1,32 @@
 {
-    "name": "pkpass/pkpass",
-    "description": "PHP PKPass class for iOS Wallet",
-    "keywords": ["PHP","apple","ios","iphone","ipad","passbook"],
-    "homepage": "https://github.com/tschoffelen/PHP-PKPass",
-    "type": "library",
-    "authors": [
-        {
-            "name": "Tom Schoffelen",
-            "homepage": "http://www.tomttb.com",
-            "email": "tom@tomttb.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.4",
-        "ext-zip": "*"
-    },
-    "autoload": {
-        "psr-4": {
-            "PKPass\\": ""
-        }
-    }
+   "name": "pkpass/pkpass",
+   "license": "MIT",
+   "description": "PHP PKPass class for iOS Wallet",
+   "keywords": [
+      "PHP",
+      "apple",
+      "ios",
+      "iphone",
+      "ipad",
+      "passbook",
+      "wallet"
+   ],
+   "homepage": "https://github.com/tschoffelen/PHP-PKPass",
+   "type": "library",
+   "authors": [
+      {
+         "name": "Thomas Schoffelen",
+         "homepage": "http://thomasschoffelen.com/",
+         "email": "thomas@scholica.com"
+      }
+   ],
+   "require": {
+      "php": ">=5.4",
+      "ext-zip": "*"
+   },
+   "autoload": {
+      "psr-4": {
+         "PKPass\\": "src"
+      }
+   }
 }
diff --git a/examples/example.php b/examples/example.php
index e87dc2e..ed67782 100644
--- a/examples/example.php
+++ b/examples/example.php
@@ -1,89 +1,85 @@
 <?php
-use PKPass\PKPass;
 
-require('../PKPass.php');
+/**
+ * Copyright (c) 2017, Thomas Schoffelen BV.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+
+use PKPass\PKPass;
 
-$pass = new PKPass();
+require('../vendor/autoload.php');
 
-$pass->setCertificate('../Certificate.p12');  // 1. Set the path to your Pass Certificate (.p12 file)
-$pass->setCertificatePassword('test123');     // 2. Set password for certificate
-$pass->setWWDRcertPath('../AppleWWDRCA.pem'); // 3. Set the path to your WWDR Intermediate certificate (.pem file)
+// Replace the parameters below with the path to your .p12 certificate and the certificate password!
+$pass = new PKPass('../Certificates.p12', 'password');
 
-// Top-Level Keys http://developer.apple.com/library/ios/#documentation/userexperience/Reference/PassKit_Bundle/Chapters/TopLevel.html
-$standardKeys         = [
-    'description'        => 'Demo pass',
-    'formatVersion'      => 1,
-    'organizationName'   => 'Flight Express',
-    'passTypeIdentifier' => 'pass.com.apple.test', // 4. Set to yours
-    'serialNumber'       => '123456',
-    'teamIdentifier'     => 'AGK5BZEN3E'           // 4. Set to yours
-];
-$associatedAppKeys    = [];
-$relevanceKeys        = [];
-$styleKeys            = [
+// Pass content
+$data = [
+    'description' => 'Demo pass',
+    'formatVersion' => 1,
+    'organizationName' => 'Flight Express',
+    'passTypeIdentifier' => 'pass.com.scholica.flights', // Change this!
+    'serialNumber' => '12345678',
+    'teamIdentifier' => 'KN44X8ZLNC', // Change this!
     'boardingPass' => [
-        'primaryFields'   => [
+        'primaryFields' => [
             [
-                'key'   => 'origin',
+                'key' => 'origin',
                 'label' => 'San Francisco',
                 'value' => 'SFO',
             ],
             [
-                'key'   => 'destination',
+                'key' => 'destination',
                 'label' => 'London',
                 'value' => 'LHR',
             ],
         ],
         'secondaryFields' => [
             [
-                'key'   => 'gate',
+                'key' => 'gate',
                 'label' => 'Gate',
                 'value' => 'F12',
             ],
             [
-                'key'   => 'date',
+                'key' => 'date',
                 'label' => 'Departure date',
                 'value' => '07/11/2012 10:22',
             ],
         ],
-        'backFields'      => [
+        'backFields' => [
             [
-                'key'   => 'passenger-name',
+                'key' => 'passenger-name',
                 'label' => 'Passenger',
                 'value' => 'John Appleseed',
             ],
         ],
-        'transitType'     => 'PKTransitTypeAir',
+        'transitType' => 'PKTransitTypeAir',
     ],
-];
-$visualAppearanceKeys = [
-    'barcode'         => [
-        'format'          => 'PKBarcodeFormatQR',
-        'message'         => 'Flight-GateF12-ID6643679AH7B',
+    'barcode' => [
+        'format' => 'PKBarcodeFormatQR',
+        'message' => 'Flight-GateF12-ID6643679AH7B',
         'messageEncoding' => 'iso-8859-1',
     ],
-    'backgroundColor' => 'rgb(107,156,196)',
-    'logoText'        => 'Flight info',
+    'backgroundColor' => 'rgb(32,110,247)',
+    'logoText' => 'Flight info',
+    'relevantDate' => date('Y-m-d\TH:i:sP')
 ];
-$webServiceKeys       = [];
-
-// Merge all pass data and set JSON for $pass object
-$passData = array_merge(
-    $standardKeys,
-    $associatedAppKeys,
-    $relevanceKeys,
-    $styleKeys,
-    $visualAppearanceKeys,
-    $webServiceKeys
-);
-
-$pass->setJSON(json_encode($passData));
+$pass->setData($data);
 
-// Add files to the PKPass package
+// Add files to the pass package
 $pass->addFile('images/icon.png');
 $pass->addFile('images/icon@2x.png');
 $pass->addFile('images/logo.png');
 
-if ( !$pass->create(true)) { // Create and output the PKPass
+// Create and output the pass
+if(!$pass->create(true)) {
     echo 'Error: ' . $pass->getError();
 }
diff --git a/examples/full_sample/index.php b/examples/full_sample/index.php
index 914f12e..46b7c27 100644
--- a/examples/full_sample/index.php
+++ b/examples/full_sample/index.php
@@ -1,67 +1,61 @@
 <?php
+
+/**
+ * Copyright (c) 2017, Thomas Schoffelen BV.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+
 use PKPass\PKPass;
 
-require_once('../../PKPass.php');
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['passenger'])) {
-	// User has filled in the flight info, so create the pass now
-
-	// Predefined data
-	$labels = [
-		'SFO' => 'San Francisco',
-		'LAX' => 'Los Angeles',
-		'LHR' => 'London',
-	];
-	$gates  = ['F12', 'G43', 'A2', 'C5', 'K9'];
-
-	// User-set vars
-	$passenger         = addslashes($_POST['passenger']);
-	$origin            = $_POST['origin'];
-	$origin_label      = $labels[$origin];
-	$destination       = $_POST['destination'];
-	$destination_label = $labels[$destination];
-	$gate              = $gates[array_rand($gates)]; // Yup, pick a random gate
-	$date              = date('m/d/Y H:i', $_POST['date']); // Convert date to string
-
-	// Create pass
-
-	//Set certifivate and path in the constructor
-	$pass = new PKPass('../../Certificate.p12', 'test123');
-
-	// Add the WWDR certificate 
-	$pass->setWWDRcertPath('../AppleWWDR.pem');
-
-	//Check if an error occured within the constructor
-	if ($pass->checkError($error) == true) {
-		exit('An error occured: ' . $error);
-	}
-
-	//Or do it manually outside of the constructor
-	/*
-	// Set the path to your Pass Certificate (.p12 file)
-	if($pass->setCertificate('../../Certificate.p12') == false) {
-		echo 'An error occured';
-		if($pass->checkError($error) == true) {
-			echo ': '.$error;
-		}
-		exit('.');
-	} 
-	// Set password for certificate
-	if($pass->setCertificatePassword('test123') == false) {
-		echo 'An error occured';
-		if($pass->checkError($error) == true) {
-			echo ': '.$error;
-		}
-		exit('.');
-	}  */
-
-	$pass->setJSON('{
-	"passTypeIdentifier": "pass.com.apple.test",
+require('../../vendor/autoload.php');
+
+if(isset($_POST['passenger'])) {
+    // User has filled in the flight info, so create the pass now
+
+    // Predefined data
+    $labels = [
+        'SFO' => 'San Francisco',
+        'LAX' => 'Los Angeles',
+        'LHR' => 'London',
+    ];
+    $gates = ['F12', 'G43', 'A2', 'C5', 'K9'];
+
+    // User-set vars
+    $passenger = addslashes($_POST['passenger']);
+    $origin = $_POST['origin'];
+    $origin_label = $labels[$origin];
+    $destination = $_POST['destination'];
+    $destination_label = $labels[$destination];
+    $gate = $gates[array_rand($gates)]; // Yup, pick a random gate
+    $date = date('m/d/Y H:i', $_POST['date']); // Convert date to string
+
+    // Create pass
+
+    //Set certificate and path in the constructor
+    $pass = new PKPass('../../Certificates.p12', 'password');
+
+    //Check if an error occurred within the constructor
+    if($pass->checkError($error) == true) {
+        exit('An error occurred: ' . $error);
+    }
+
+    // Set pass data
+    $pass->setData('{
+	"passTypeIdentifier": "pass.com.scholica.flights",
 	"formatVersion": 1,
 	"organizationName": "Flight Express",
 	"serialNumber": "123456",
-	"teamIdentifier": "AGK5BZEN3E",
-	"backgroundColor": "rgb(107,156,196)",
+	"teamIdentifier": "KN44X8ZLNC",
+	"backgroundColor": "rgb(32,110,247)",
 	"logoText": "FLIGHT_INFO_LABEL",
 	"description": "Demo pass",
 	"boardingPass": {
@@ -103,39 +97,41 @@
         "format": "PKBarcodeFormatQR",
         "message": "Flight-Gate' . $gate . '-' . $date . '-' . $passenger . '-' . $destination . '",
         "messageEncoding": "iso-8859-1"
-    }
+    },
+    "relevantDate": "' . date('Y-m-d\TH:i:sP', $_POST['date']) . '"
     }');
-	if ($pass->checkError($error) == true) {
-		exit('An error occured: ' . $error);
-	}
-
-	// add files to the PKPass package
-	$pass->addFile('../images/icon.png');
-	$pass->addFile('../images/icon@2x.png');
-	$pass->addFile('../images/logo.png');
-	// specify english and french localizations
-	$pass->addFile('en.strings', 'en.lproj/pass.strings');
-	$pass->addFile('fr.strings', 'fr.lproj/pass.strings');
-	if ($pass->checkError($error) == true) {
-		exit('An error occured: ' . $error);
-	}
-
-	//If you pass true, the class will output the zip into the browser.
-	$result = $pass->create(true);
-	if ($result == false) { // Create and output the PKPass
-		echo $pass->getError();
-	}
+    if($pass->checkError($error) == true) {
+        exit('An error occured: ' . $error);
+    }
+
+    // Add files to the PKPass package
+    $pass->addFile('../images/icon.png');
+    $pass->addFile('../images/icon@2x.png');
+    $pass->addFile('../images/logo.png');
+    // Specify english and french localizations
+    $pass->addFile('en.strings', 'en.lproj/pass.strings');
+    $pass->addFile('fr.strings', 'fr.lproj/pass.strings');
+
+    if($pass->checkError($error) == true) {
+        exit('An error occured: ' . $error);
+    }
+    // Create and output the PKPass
+    // If you pass true, the class will output the zip into the browser.
+    $result = $pass->create(true);
+    if($result == false) {
+        echo $pass->getError();
+    }
 } else {
-	// User lands here, there are no $_POST variables set	
+    // User lands here, there are no $_POST variables set
 	?>
 	<html>
 	<head>
 		<title>Flight pass creator - PHP class demo</title>
-
-		<!-- Reusing some CSS from another project of mine -->
-		<link href="http://www.lifeschool.nl/static/bootstrap.css" rel="stylesheet" type="text/css"/>
 		<meta name="viewport" content="width=320; user-scalable=no"/>
 		<style>
+            body {
+                font-family: Helvetica, sans-serif;
+            }
 			.header {
 				color: white;
 				background-color: #6699cc;
@@ -199,11 +195,11 @@
 						<select name="origin" style="width: auto;">
 							<option value="SFO">San Francisco</option>
 							<option value="LAX">Los Angeles</option>
-							<option value="LHR">Londen</option>
+							<option value="LHR">London</option>
 						</select> &nbsp; to &nbsp; <select name="destination" style="width: auto;">
 							<option value="SFO">San Francisco</option>
 							<option value="LAX">Los Angeles</option>
-							<option value="LHR">Londen</option>
+							<option value="LHR">London</option>
 						</select>
 					</div>
 				</div>
@@ -234,6 +230,4 @@
 	</div>
 	</body>
 	</html>
-	<?php
-}
-?>
+<?php } ?>
\ No newline at end of file
diff --git a/examples/starbucks_sample/index.php b/examples/starbucks_sample/index.php
index 593aaa8..ad9f9b6 100644
--- a/examples/starbucks_sample/index.php
+++ b/examples/starbucks_sample/index.php
@@ -1,28 +1,41 @@
 <?php
+
+/**
+ * Copyright (c) 2017, Thomas Schoffelen BV.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+
 use PKPass\PKPass;
 
-if (isset($_POST['name'])) {
+require('../../vendor/autoload.php');
+
+if(isset($_POST['name'])) {
     // User has filled in the card info, so create the pass now
 
     setlocale(LC_MONETARY, 'en_US');
-    require('../../PKPass.php');
 
     // Variables
-    $id      = rand(100000, 999999) . '-' . rand(100, 999) . '-' . rand(100, 999); // Every card should have a unique serialNumber
+    $id = rand(100000, 999999) . '-' . rand(100, 999) . '-' . rand(100, 999); // Every card should have a unique serialNumber
     $balance = '$' . rand(0, 30) . '.' . rand(10, 99); // Create random balance
-    $name    = stripslashes($_POST['name']);
+    $name = stripslashes($_POST['name']);
 
     // Create pass
-    $pass = new PKPass();
-
-    $pass->setCertificate('../../../Certificate.p12'); // Set the path to your Pass Certificate (.p12 file)
-    $pass->setCertificatePassword('test123'); // Set password for certificate
-    $pass->setWWDRcertPath('../../../AppleWWDR.pem');
-    $pass->setJSON('{
-	"passTypeIdentifier": "pass.com.apple.test",
+    // Set the path to your Pass Certificate (.p12 file)
+    $pass = new PKPass('../../Certificates.p12', 'password');
+    $pass->setData('{
+	"passTypeIdentifier": "pass.com.scholica.flights", 
 	"formatVersion": 1,
 	"organizationName": "Starbucks",
-	"teamIdentifier": "AGK5BZEN3E",
+	"teamIdentifier": "KN44X8ZLNC",
 	"serialNumber": "' . $id . '",
     "backgroundColor": "rgb(240,240,240)",
 	"logoText": "Starbucks",
@@ -63,21 +76,23 @@
     $pass->addFile('logo.png');
     $pass->addFile('background.png', 'strip.png');
 
-    if ( !$pass->create(true)) { // Create and output the PKPass
+    if(!$pass->create(true)) { // Create and output the PKPass
         echo 'Error: ' . $pass->getError();
     }
     exit;
 } else {
     // User lands here, there are no $_POST variables set
 
-?><html>
+    ?>
+    <html>
     <head>
         <title>Starbucks pass creator - PHP class demo</title>
-
-        <!-- Reusing some CSS from another project of mine -->
-        <link href="http://www.lifeschool.nl/static/bootstrap.css" rel="stylesheet" type="text/css"/>
-        <meta name="viewport" content="width=320; user-scalable=no"/>
+        <meta name="viewport" content="width=device-width; user-scalable=no"/>
         <style>
+            body {
+                font-family: Helvetica, sans-serif;
+            }
+
             .header {
                 background-color: #CCC;
                 padding-top: 30px;
@@ -127,7 +142,8 @@
     </head>
     <body>
     <div class="header">
-        <img class="logo" src="logo_web.png"/> <span class="title">Starbucks</span>
+        <img class="logo" src="logo_web.png"/>
+        <span class="title">Starbucks</span>
     </div>
     <div class="userinfo">
         <form action="index.php" method="post" class="form-stacked">
@@ -137,7 +153,11 @@
                 <div class="clearfix">
                     <label style="text-align:left" for="name">Nickname</label>
                     <div class="input">
-                        <input class="xlarge" name="name" id="name" type="text" value="Johnny's card"/>
+                        <input class="xlarge"
+                               name="name"
+                               id="name"
+                               type="text"
+                               value="Johnny's card"/>
                     </div>
                 </div>
 
@@ -148,6 +168,5 @@
 
     </div>
     </body>
-</html>
-<?
-}
+    </html>
+<?php } ?>
diff --git a/readme.md b/readme.md
deleted file mode 100644
index 11fe98e..0000000
--- a/readme.md
+++ /dev/null
@@ -1,116 +0,0 @@
-[![OpenCollective](https://opencollective.com/php-pkpass/backers/badge.svg)](#backers) 
-[![OpenCollective](https://opencollective.com/php-pkpass/sponsors/badge.svg)](#sponsors)
-
-# PHP PKPass class for iOS Wallet
-This class provides the functionality to create an Pass for Passbook in Apple's iOS 6 and newer on-the-fly. It creates, signs and packages the Pass as a .pkpass file according to Apple's documentation.
-
-## Requirements
-* PHP 5.4
-* PHP [ZIP Support](http://php.net/manual/en/book.zip.php) (May be installed by default)
-* Access to filesystem (Script must be able to create temporary folders)
-
-## Installation
-#### Composer
-Run: `$ composer require pkpass/pkpass`
-
-or add to your composer.json: `"pkpass/pkpass": "dev-master"`
-
-#### Manual
-Require PKPass.php file in your php files `require('PKPass.php');`
-
-## Usage
-Please take a look at the example.php file for example usage. For more info on the JSON for the pass and how to style it, take a look at the [docs at developers.apple.com](https://developer.apple.com/library/ios/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/Introduction.html).
-
-### Requesting the Pass Certificate
-1. Go to the [iOS Provisioning portal](https://developer.apple.com/ios/manage/passtypeids/ios/manage)
-2. Create a new Pass Type ID
-3. Request the certificate like shown
-4. Download the .cer file and drag it into Keychain Access
-5. Right click the certificate in Keychain Access and choose `Export 'pass.<id>'…`
-6. Choose a password and export the file to a folder
-
-### Getting the example.php sample to work
-1. Request the Pass certificate (`.p12`) and upload it to your server
-2. Set the correct path and password on [line 8 and 9](examples/example.php#L8)
-3. Download and import your [WWDR Intermediate certificate](https://developer.apple.com/certificationauthority/AppleWWDRCA.cer) to Keychain, export as `.pem` and set the correct path on [line 10](examples/example.php#L10)
-4. Change the `passTypeIdentifier` and `teamIndentifier` to the correct values, which can be found on the [iOS Provisioning portal](https://developer.apple.com/ios/manage/passtypeids/ios/manage) after clicking on 'Configure' next to the Pass ID, on line [17](examples/example.php#L17) and [19](examples/example.php#L19)
-
-After completing these steps, you should be ready to go. Upload all the files to your server and navigate to the address of the example.php file on your iPhone.
-
-## Included demos
-* [Simple example](examples/example.php)
-* [Full example](examples/full_sample/)
-* [Starbucks example](examples/starbucks_sample/)
-
-## Support & documentation
-Please read the instructions above and consult the [Passbook Documentation](https://developer.apple.com/passbook/) before submitting tickets or requesting support. It might also be worth to [check Stackoverflow](http://stackoverflow.com/search?q=%22PHP-PKPass%22), which contains quite a few questions about this library.
-
-Email me at thomas [at] scholica.com or tweet me [@tschoffelen](http://www.twitter.com/tschoffelen).
-
-## Backers
-Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/php-pkpass#backer)]
-
-<a href="https://opencollective.com/php-pkpass/backer/0/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/0/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/1/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/1/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/2/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/2/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/3/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/3/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/4/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/4/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/5/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/5/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/6/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/6/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/7/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/7/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/8/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/8/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/9/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/9/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/10/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/10/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/11/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/11/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/12/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/12/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/13/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/13/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/14/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/14/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/15/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/15/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/16/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/16/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/17/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/17/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/18/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/18/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/19/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/19/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/20/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/20/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/21/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/21/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/22/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/22/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/23/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/23/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/24/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/24/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/25/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/25/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/26/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/26/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/27/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/27/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/28/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/28/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/backer/29/website" target="_blank"><img src="https://opencollective.com/php-pkpass/backer/29/avatar.svg"></a>
-
-## Sponsors
-Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/php-pkpass#sponsor)]
-
-<a href="https://opencollective.com/php-pkpass/sponsor/0/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/1/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/2/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/3/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/4/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/5/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/6/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/7/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/8/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/9/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/9/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/10/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/10/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/11/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/11/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/12/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/12/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/13/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/13/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/14/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/14/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/15/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/15/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/16/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/16/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/17/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/17/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/18/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/18/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/19/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/19/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/20/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/20/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/21/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/21/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/22/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/22/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/23/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/23/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/24/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/24/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/25/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/25/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/26/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/26/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/27/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/27/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/28/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/28/avatar.svg"></a>
-<a href="https://opencollective.com/php-pkpass/sponsor/29/website" target="_blank"><img src="https://opencollective.com/php-pkpass/sponsor/29/avatar.svg"></a>
diff --git a/src/Certificate/AppleWWDRCA.pem b/src/Certificate/AppleWWDRCA.pem
new file mode 100644
index 0000000..35e707e
--- /dev/null
+++ b/src/Certificate/AppleWWDRCA.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEIjCCAwqgAwIBAgIIAd68xDltoBAwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UE
+BhMCVVMxEzARBgNVBAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1BcHBsZSBSb290IENBMB4XDTEz
+MDIwNzIxNDg0N1oXDTIzMDIwNzIxNDg0N1owgZYxCzAJBgNVBAYTAlVTMRMwEQYD
+VQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3JsZHdpZGUgRGV2ZWxv
+cGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3aWRlIERldmVsb3Bl
+ciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDKOFSmy1aqyCQ5SOmM7uxfuH8mkbw0U3rOfGOA
+YXdkXqUHI7Y5/lAtFVZYcC1+xG7BSoU+L/DehBqhV8mvexj/avoVEkkVCBmsqtsq
+Mu2WY2hSFT2Miuy/axiV4AOsAX2XBWfODoWVN2rtCbauZ81RZJ/GXNG8V25nNYB2
+NqSHgW44j9grFU57Jdhav06DwY3Sk9UacbVgnJ0zTlX5ElgMhrgWDcHld0WNUEi6
+Ky3klIXh6MSdxmilsKP8Z35wugJZS3dCkTm59c3hTO/AO0iMpuUhXf1qarunFjVg
+0uat80YpyejDi+l5wGphZxWy8P3laLxiX27Pmd3vG2P+kmWrAgMBAAGjgaYwgaMw
+HQYDVR0OBBYEFIgnFwmpthhgi+zruvZHWcVSVKO3MA8GA1UdEwEB/wQFMAMBAf8w
+HwYDVR0jBBgwFoAUK9BpR5R2Cf70a40uQKb3R01/CF4wLgYDVR0fBCcwJTAjoCGg
+H4YdaHR0cDovL2NybC5hcHBsZS5jb20vcm9vdC5jcmwwDgYDVR0PAQH/BAQDAgGG
+MBAGCiqGSIb3Y2QGAgEEAgUAMA0GCSqGSIb3DQEBBQUAA4IBAQBPz+9Zviz1smwv
+j+4ThzLoBTWobot9yWkMudkXvHcs1Gfi/ZptOllc34MBvbKuKmFysa/Nw0Uwj6OD
+Dc4dR7Txk4qjdJukw5hyhzs+r0ULklS5MruQGFNrCk4QttkdUGwhgAqJTleMa1s8
+Pab93vcNIx0LSiaHP7qRkkykGRIZbVf1eliHe2iK5IaMSuviSRSqpd1VAKmuu0sw
+ruGgsbwpgOYJd+W+NKIByn/c4grmO7i77LpilfMFY0GCzQ87HUyVpNur+cmV6U/k
+TecmmYHpvPm0KdIBembhLoz2IYrF+Hjhga6/05Cdqa3zr/04GpZnMBxRpVzscYqC
+tGwPDBUf
+-----END CERTIFICATE-----
diff --git a/PKPass.php b/src/PKPass.php
similarity index 56%
rename from PKPass.php
rename to src/PKPass.php
index 3435905..94f5fdf 100644
--- a/PKPass.php
+++ b/src/PKPass.php
@@ -1,15 +1,22 @@
 <?php
+
 /**
- * PKPass - Creates iOS 6 passes.
+ * Copyright (c) 2017, Thomas Schoffelen BV.
  *
- * Author: Tom Schoffelen
- * Revision: Tom Janssen
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * www.tomttb.com
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
+
 namespace PKPass;
 
-use ZipArchive as ZipArchive;
+use ZipArchive;
 
 /**
  * Class PKPass.
@@ -37,13 +44,13 @@ class PKPass
      * Holds the json
      * Variable: class.
      */
-    protected $JSON;
+    protected $json;
 
     /**
      * Holds the SHAs of the $files array
      * Variable: array.
      */
-    protected $SHAs;
+    protected $shas;
 
     /**
      * Holds the password to the certificate
@@ -55,7 +62,7 @@ class PKPass
      * Holds the path to the WWDR Intermediate certificate
      * Variable: string.
      */
-    protected $WWDRcertPath = '';
+    protected $wwdrCertPath = '';
 
     /**
      * Holds the path to a temporary folder.
@@ -63,12 +70,13 @@ class PKPass
     protected $tempPath = '/tmp/'; // Must end with slash!
 
     /**
-     * Holds error info if an error occured.
+     * Holds error info if an error occurred.
      */
     private $sError = '';
 
     /**
-     * Holds a autogenerated uniqid to prevent overwriting other processes pass files.
+     * Holds a auto-generated uniqid to prevent overwriting other processes pass
+     * files.
      */
     private $uniqid = null;
 
@@ -81,21 +89,23 @@ class PKPass
      */
     public function __construct($certPath = false, $certPass = false, $JSON = false)
     {
-        if ($certPath != false) {
+        $this->wwdrCertPath = __DIR__ . '/Certificate/AppleWWDRCA.pem';
+
+        if($certPath != false) {
             $this->setCertificate($certPath);
         }
-        if ($certPass != false) {
+        if($certPass != false) {
             $this->setCertificatePassword($certPass);
         }
-        if ($JSON != false) {
-            $this->setJSON($JSON);
+        if($JSON != false) {
+            $this->setData($JSON);
         }
     }
 
     /**
      * Sets the path to a certificate
      * Parameter: string, path to certificate
-     * Return: boolean, true on succes, false if file doesn't exist.
+     * Return: boolean, true on success, false if file does not exist.
      *
      * @param $path
      *
@@ -103,7 +113,7 @@ public function __construct($certPath = false, $certPass = false, $JSON = false)
      */
     public function setCertificate($path)
     {
-        if (file_exists($path)) {
+        if(file_exists($path)) {
             $this->certPath = $path;
 
             return true;
@@ -141,24 +151,21 @@ public function setCertificatePassword($p)
      */
     public function setWWDRcertPath($path)
     {
-        $this->WWDRcertPath = $path;
+        $this->wwdrCertPath = $path;
 
         return true;
     }
 
     /**
-     * Sets the path to the temporary directory (must end with a slash)
-     * Parameter: string, path to temporary directory
-     * Return: boolean, true on success, false if directory doesn't exist.
-     *
-     * @param $path
+     * Set the path to the temporary directory.
      *
+     * @param string $path Path to temporary directory
      * @return bool
      */
     public function setTempPath($path)
     {
-        if (is_dir($path)) {
-            $this->tempPath = $path;
+        if(is_dir($path)) {
+            $this->tempPath = rtrim($path, '/') . '/';
 
             return true;
         }
@@ -167,18 +174,36 @@ public function setTempPath($path)
     }
 
     /**
-     * Decodes JSON and saves it to a variable
-     * Parameter: json-string
-     * Return: boolean, true on succes, false if json wasn't decodable.
+     * Set JSON for pass.
      *
-     * @param $JSON
+     * @deprecated in favor of `setData()`
+     *
+     * @param string|array $json
+     * @return bool
+     */
+    public function setJSON($json)
+    {
+        return $this->setData($json);
+    }
+
+    /**
+     * Set pass data.
      *
+     * @param string|array $data
      * @return bool
      */
-    public function setJSON($JSON)
+    public function setData($data)
     {
-        if (json_decode($JSON) !== false) {
-            $this->JSON = $JSON;
+        // Array is passed as input
+        if(is_array($data)) {
+            $this->json = json_encode($data);
+
+            return true;
+        }
+
+        // JSON string is passed as input
+        if(json_decode($data) !== false) {
+            $this->json = $data;
 
             return true;
         }
@@ -189,19 +214,16 @@ public function setJSON($JSON)
     }
 
     /**
-     * Adds file to the file array
-     * Parameter: string, path to file
-     * Parameter: string, optional, name to create file as
-     * Return: boolean, true on succes, false if file doesn't exist.
-     *
-     * @param      $path
-     * @param null $name
+     * Add a file to the file array.
      *
+     * @param string $path Path to file
+     * @param string $name Filename to use in pass archive
+     *     (default is equal to $path)
      * @return bool
      */
     public function addFile($path, $name = null)
     {
-        if (file_exists($path)) {
+        if(file_exists($path)) {
             $name = ($name === null) ? basename($path) : $name;
             $this->files[$name] = $path;
 
@@ -214,41 +236,40 @@ public function addFile($path, $name = null)
     }
 
     /**
-     * Creates the actual .pkpass file
-     * Parameter: boolean, if output is true, send the zip file to the browser.
-     * Return: zipped .pkpass file on succes, false on failure.
+     * Create the actual .pkpass file.
      *
-     * @param bool $output
+     * @param bool $output Whether to output it directly or return the pass
+     *     contents as a string.
      *
      * @return bool|string
      */
     public function create($output = false)
     {
-        $paths = $this->paths();
+        $paths = $this->getTempPaths();
 
-        //Creates and saves the json manifest
-        if (!($manifest = $this->createManifest())) {
+        // Creates and saves the json manifest
+        if(!($manifest = $this->createManifest())) {
             $this->clean();
 
             return false;
         }
 
-        //Create signature
-        if ($this->createSignature($manifest) == false) {
+        // Create signature
+        if($this->createSignature($manifest) == false) {
             $this->clean();
 
             return false;
         }
 
-        if ($this->createZip($manifest) == false) {
+        if($this->createZip($manifest) == false) {
             $this->clean();
 
             return false;
         }
 
         // Check if pass is created and valid
-        if (!file_exists($paths['pkpass']) || filesize($paths['pkpass']) < 1) {
-            $this->sError = 'Error while creating pass.pkpass. Check your Zip extension.';
+        if(!file_exists($paths['pkpass']) || filesize($paths['pkpass']) < 1) {
+            $this->sError = 'Error while creating pass.pkpass. Check your ZIP extension.';
             $this->clean();
 
             return false;
@@ -258,14 +279,14 @@ public function create($output = false)
         $file = file_get_contents($paths['pkpass']);
         $size = filesize($paths['pkpass']);
         $name = basename($paths['pkpass']);
-        
+
         // Cleanup
         $this->clean();
-        
+
         // Output pass
-        if ($output == true) {
+        if($output == true) {
             $fileName = $this->getName() ? $this->getName() : $name;
-            if(!strstr($fileName, '.')){
+            if(!strstr($fileName, '.')) {
                 $fileName .= '.pkpass';
             }
             header('Content-Description: File Transfer');
@@ -280,9 +301,10 @@ public function create($output = false)
             ob_end_flush();
             set_time_limit(0);
             echo $file;
+
             return true;
         }
-        
+
         return $file;
     }
 
@@ -309,7 +331,7 @@ public function setName($name)
      */
     public function checkError(&$error)
     {
-        if (trim($this->sError) == '') {
+        if(trim($this->sError) == '') {
             return false;
         }
 
@@ -327,29 +349,30 @@ public function getError()
     }
 
     /**
-     * Subfunction of create()
-     * This function creates the hashes for the files and adds them into a json string.
+     * Sub-function of create()
+     * This function creates the hashes for the files and adds them into a json
+     * string.
      */
     protected function createManifest()
     {
         // Creates SHA hashes for all files in package
-        $this->SHAs['pass.json'] = sha1($this->JSON);
-        $hasicon = false;
-        foreach ($this->files as $name => $path) {
-            if (strtolower($name) == 'icon.png') {
-                $hasicon = true;
+        $this->shas['pass.json'] = sha1($this->json);
+        $has_icon = false;
+        foreach($this->files as $name => $path) {
+            if(strtolower($name) == 'icon.png') {
+                $has_icon = true;
             }
-            $this->SHAs[$name] = sha1(file_get_contents($path));
+            $this->shas[$name] = sha1(file_get_contents($path));
         }
 
-        if (!$hasicon) {
+        if(!$has_icon) {
             $this->sError = 'Missing required icon.png file.';
             $this->clean();
 
             return false;
         }
 
-        $manifest = json_encode((object) $this->SHAs);
+        $manifest = json_encode((object)$this->shas);
 
         return $manifest;
     }
@@ -379,7 +402,7 @@ protected function convertPEMtoDER($signature)
     /**
      * Creates a signature and saves it
      * Parameter: json-string, manifest file
-     * Return: boolean, true on succes, failse on failure.
+     * Return: boolean, true on success, false on failure.
      *
      * @param $manifest
      *
@@ -387,46 +410,53 @@ protected function convertPEMtoDER($signature)
      */
     protected function createSignature($manifest)
     {
-        $paths = $this->paths();
+        $paths = $this->getTempPaths();
 
         file_put_contents($paths['manifest'], $manifest);
 
-        $pkcs12 = file_get_contents($this->certPath);
-        $certs = [];
-        if (openssl_pkcs12_read($pkcs12, $certs, $this->certPass) == true) {
-            $certdata = openssl_x509_read($certs['cert']);
-            $privkey = openssl_pkey_get_private($certs['pkey'], $this->certPass);
-
-            if (!empty($this->WWDRcertPath)) {
-                if (!file_exists($this->WWDRcertPath)) {
-                    $this->sError = 'WWDR Intermediate Certificate does not exist';
-
-                    return false;
-                }
-
-                openssl_pkcs7_sign(
-                    $paths['manifest'],
-                    $paths['signature'],
-                    $certdata,
-                    $privkey,
-                    [],
-                    PKCS7_BINARY | PKCS7_DETACHED,
-                    $this->WWDRcertPath
-                );
-            } else {
-                openssl_pkcs7_sign($paths['manifest'], $paths['signature'], $certdata, $privkey, [], PKCS7_BINARY | PKCS7_DETACHED);
-            }
+        if(!$pkcs12 = file_get_contents($this->certPath)) {
+            $this->sError = 'Could not read the certificate';
 
-            $signature = file_get_contents($paths['signature']);
-            $signature = $this->convertPEMtoDER($signature);
-            file_put_contents($paths['signature'], $signature);
+            return false;
+        }
 
-            return true;
-        } else {
-            $this->sError = 'Could not read the certificate';
+        $certs = [];
+        if(!openssl_pkcs12_read($pkcs12, $certs, $this->certPass)) {
+            $this->sError = 'Invalid certificate file. Make sure you have a ' .
+                'P12 certificate that also contains a private key, and you ' .
+                'have specified the correct password!';
 
             return false;
         }
+        $certdata = openssl_x509_read($certs['cert']);
+        $privkey = openssl_pkey_get_private($certs['pkey'], $this->certPass);
+
+        $openssl_args = [
+            $paths['manifest'],
+            $paths['signature'],
+            $certdata,
+            $privkey,
+            [],
+            PKCS7_BINARY | PKCS7_DETACHED
+        ];
+
+        if(!empty($this->wwdrCertPath)) {
+            if(!file_exists($this->wwdrCertPath)) {
+                $this->sError = 'WWDR Intermediate Certificate does not exist';
+
+                return false;
+            }
+
+            $openssl_args[] = $this->wwdrCertPath;
+        }
+
+        call_user_func_array('openssl_pkcs7_sign', $openssl_args);
+
+        $signature = file_get_contents($paths['signature']);
+        $signature = $this->convertPEMtoDER($signature);
+        file_put_contents($paths['signature'], $signature);
+
+        return true;
     }
 
     /**
@@ -440,19 +470,19 @@ protected function createSignature($manifest)
      */
     protected function createZip($manifest)
     {
-        $paths = $this->paths();
+        $paths = $this->getTempPaths();
 
         // Package file in Zip (as .pkpass)
         $zip = new ZipArchive();
-        if (!$zip->open($paths['pkpass'], ZipArchive::CREATE)) {
-            $this->sError = 'Could not open '.basename($paths['pkpass']).' with ZipArchive extension.';
+        if(!$zip->open($paths['pkpass'], ZipArchive::CREATE)) {
+            $this->sError = 'Could not open ' . basename($paths['pkpass']) . ' with ZipArchive extension.';
 
             return false;
         }
         $zip->addFile($paths['signature'], 'signature');
         $zip->addFromString('manifest.json', $manifest);
-        $zip->addFromString('pass.json', $this->JSON);
-        foreach ($this->files as $name => $path) {
+        $zip->addFromString('pass.json', $this->json);
+        foreach($this->files as $name => $path) {
             $zip->addFile($path, $name);
         }
         $zip->close();
@@ -463,32 +493,33 @@ protected function createZip($manifest)
     /**
      * Declares all paths used for temporary files.
      */
-    protected function paths()
+    protected function getTempPaths()
     {
-        //Declare base paths
+        // Declare base paths
         $paths = [
             'pkpass' => 'pass.pkpass',
             'signature' => 'signature',
             'manifest' => 'manifest.json',
         ];
 
-        //If trailing slash is missing, add it
-        if (substr($this->tempPath, -1) != '/') {
-            $this->tempPath = $this->tempPath.'/';
+        // If trailing slash is missing, add it
+        if(substr($this->tempPath, -1) != '/') {
+            $this->tempPath = $this->tempPath . '/';
         }
 
-        //Generate a unique subfolder in the tempPath to support generating more passes at the same time without erasing/overwriting each others files
-        if (empty($this->uniqid)) {
+        // Generate a unique sub-folder in the tempPath to support generating more
+        // passes at the same time without erasing/overwriting each others files
+        if(empty($this->uniqid)) {
             $this->uniqid = uniqid('PKPass', true);
 
-            if (!is_dir($this->tempPath.$this->uniqid)) {
-                mkdir($this->tempPath.$this->uniqid);
+            if(!is_dir($this->tempPath . $this->uniqid)) {
+                mkdir($this->tempPath . $this->uniqid);
             }
         }
 
-        //Add temp folder path
-        foreach ($paths as $pathName => $path) {
-            $paths[$pathName] = $this->tempPath.$this->uniqid.'/'.$path;
+        // Add temp folder path
+        foreach($paths as $pathName => $path) {
+            $paths[$pathName] = $this->tempPath . $this->uniqid . '/' . $path;
         }
 
         return $paths;
@@ -499,17 +530,17 @@ protected function paths()
      */
     protected function clean()
     {
-        $paths = $this->paths();
+        $paths = $this->getTempPaths();
 
-        foreach ($paths as $path) {
-            if (file_exists($path)) {
+        foreach($paths as $path) {
+            if(file_exists($path)) {
                 unlink($path);
             }
         }
 
-        //Remove our unique temporary folder
-        if (is_dir($this->tempPath.$this->uniqid)) {
-            rmdir($this->tempPath.$this->uniqid);
+        // Remove our unique temporary folder
+        if(is_dir($this->tempPath . $this->uniqid)) {
+            rmdir($this->tempPath . $this->uniqid);
         }
 
         return true;