diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
new file mode 100644
index 000000000..83eda8d0a
--- /dev/null
+++ b/.github/workflows/continuous-integration.yml
@@ -0,0 +1,39 @@
+name: continuous-integration
+ 
+on: [push, pull_request]
+ 
+jobs:
+  compile:
+    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        java: [ 11, 12, 13 ]
+    name: maven-compile-test-deploy
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # we need full history to use set-version below
+
+      - uses: FacilityNet/set-version@v1
+        id: set_version
+        with:
+          eventName: ${{ github.event_name }}
+          event: ${{ toJSON(github.event) }}
+
+      - uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Publish to GitHub Packages
+        run: mvn deploy -Drevision=${{ steps.set_version.outputs.fullNoMeta }} -Dchangelist= -Dsha1=
+        env:
+          GITHUB_ACTOR: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ github.token }}
diff --git a/pom.xml b/pom.xml
index e303359bc..ef060403d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,16 +28,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.microsoft.ews-java-api</groupId>
+    <groupId>dk.facilitynet.connectors.calendar</groupId>
     <artifactId>ews-java-api</artifactId>
     
-    <version>2.1-SNAPSHOT</version>
+    <version>${revision}${changelist}${sha1}</version>
 
-    <name>Exchange Web Services Java API</name>
-    <description>Exchange Web Services (EWS) Java API</description>
+    <description>Exchange Web Services (EWS) Java API - FacilityNet fork</description>
 
     <!-- Required by the site command for certain relative URL configuration. -->
-    <url>http://www.microsoft.com/</url>
+    <url>https://facilitynet.io/</url>
 
     <!-- Used by the javadoc plugin to generate the comments at the bottom. -->
     <inceptionYear>2012</inceptionYear>
@@ -49,30 +48,15 @@
     </prerequisites>
 
     <organization>
-        <name>Microsoft</name>
-        <url>http://www.microsoft.com/</url>
+        <name>FacilityNet</name>
+        <url>https://facilitynet.io/</url>
     </organization>
 
-    <developers>
-        <developer>
-            <id>vboctor</id>
-            <name>Victor Boctor</name>
-            <email>vboctor@users.noreply.github.com</email>
-            <url>http://www.github.com/officedev/ews-java-api</url>
-            <organization>Microsoft</organization>
-            <organizationUrl>http://www.microsoft.com</organizationUrl>
-            <roles>
-                <role>administrator</role>
-                <role>developer</role>
-            </roles>
-            <timezone>America/New_York</timezone>
-            <properties>
-                 <picUrl>http://www.example.com/jdoe/pic</picUrl>
-            </properties>
-        </developer>
-    </developers>
-
     <properties>
+        <revision>2.0.1</revision>
+        <changelist>-SNAPSHOT</changelist>
+        <sha1></sha1>
+
         <!-- Eliminates the file encoding warning. Of course, all of your files
             should probably be UTF-8 nowadays. -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -190,25 +174,16 @@
         <system>GitHub Issues</system>
     </issueManagement>
 
-    <ciManagement>
-        <system>travis</system>
-        <url>https://travis-ci.org/OfficeDev/ews-java-api</url>
-    </ciManagement>
-
     <scm>
-        <url>https://github.com/OfficeDev/ews-java-api</url>
-        <connection>scm:git:ssh://git@github.com:OfficeDev/ews-java-api.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com:OfficeDev/ews-java-api.git</developerConnection>
+        <url>https://github.com/FacilityNet/ews-java-api</url>
+        <connection>scm:git:https://github.com/FacilityNet/ews-java-api.git</connection>
     </scm>
 
     <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh-snapshot</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
         <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+            <id>github</id>
+            <name>GitHub Packages</name>
+            <url>https://maven.pkg.github.com/facilitynet/ews-java-api</url>
         </repository>
     </distributionManagement>
 
@@ -295,18 +270,52 @@
 
     <build>
         <plugins>
-            <!-- Deployment / build plugins -->
+            <!-- Used to replace CI version placeholders with actual versions in generated pom -->
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>${nexus-staging-maven-plugin.version}</version>
-                <extensions>true</extensions>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.2.1</version>
                 <configuration>
-                    <!-- Ref.: http://books.sonatype.com/nexus-book/reference/staging-deployment.html -->
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>defaults</flattenMode>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Used by CircleCI -->
+            <plugin>
+                <groupId>de.qaware.maven</groupId>
+                <artifactId>go-offline-maven-plugin</artifactId>
+                <version>1.2.5</version>
+                <configuration>
+                    <dynamicDependencies>
+                        <DynamicDependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit4</artifactId>
+                            <version>2.20.1</version>
+                            <repositoryType>PLUGIN</repositoryType>
+                        </DynamicDependency>
+                    </dynamicDependencies>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.0.0-M1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/microsoft/exchange/webservices/data/misc/MapiTypeConverter.java b/src/main/java/microsoft/exchange/webservices/data/misc/MapiTypeConverter.java
index 4ad9dbf68..32d79c448 100644
--- a/src/main/java/microsoft/exchange/webservices/data/misc/MapiTypeConverter.java
+++ b/src/main/java/microsoft/exchange/webservices/data/misc/MapiTypeConverter.java
@@ -76,7 +76,7 @@ public MapiTypeConverterMap createInstance() {
            mapitype.setIsArray(true);
            map.put(MapiPropertyType.ApplicationTimeArray, mapitype);
 
-           mapitype = new MapiTypeConverterMapEntry(Byte[].class);
+           mapitype = new MapiTypeConverterMapEntry(byte[].class);
            mapitype.setParse(IFunctions.Base64Decoder.INSTANCE);
            mapitype.setConvertToString(IFunctions.Base64Encoder.INSTANCE);
            map.put(MapiPropertyType.Binary, mapitype);
diff --git a/src/main/java/microsoft/exchange/webservices/data/misc/MapiTypeConverterMapEntry.java b/src/main/java/microsoft/exchange/webservices/data/misc/MapiTypeConverterMapEntry.java
index 6ca1f0228..652623d58 100644
--- a/src/main/java/microsoft/exchange/webservices/data/misc/MapiTypeConverterMapEntry.java
+++ b/src/main/java/microsoft/exchange/webservices/data/misc/MapiTypeConverterMapEntry.java
@@ -60,6 +60,7 @@ public Map<Class<?>, Object> createInstance() {
           Map<Class<?>, Object> map = new HashMap<Class<?>, Object>();
 
           map.put(Boolean.class, false);
+          map.put(byte[].class, null);
           map.put(Byte[].class, null);
           map.put(Short.class, new Short((short) 0));
           map.put(Integer.class, 0);
diff --git a/src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java b/src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java
index f0ab97d49..933ee5272 100644
--- a/src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java
+++ b/src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java
@@ -241,6 +241,7 @@ public static Map<String, String> createOlsonTimeZoneToMsMap() {
     map.put("America/Porto_Acre", "SA Pacific Standard Time");
     map.put("America/Porto_Velho", "SA Western Standard Time");
     map.put("America/Puerto_Rico", "SA Western Standard Time");
+    map.put("America/Punta_Arenas", "Pacific SA Standard Time");
     map.put("America/Rainy_River", "Central Standard Time");
     map.put("America/Rankin_Inlet", "Central Standard Time");
     map.put("America/Recife", "SA Eastern Standard Time");
@@ -465,6 +466,7 @@ public static Map<String, String> createOlsonTimeZoneToMsMap() {
     map.put("Etc/Zulu", "UTC");
     map.put("Europe/Amsterdam", "W. Europe Standard Time");
     map.put("Europe/Andorra", "W. Europe Standard Time");
+    map.put("Europe/Astrakhan", "Russia Time Zone 3");
     map.put("Europe/Athens", "GTB Standard Time");
     map.put("Europe/Belfast", "GMT Standard Time");
     map.put("Europe/Belgrade", "Central Europe Standard Time");
@@ -485,6 +487,7 @@ public static Map<String, String> createOlsonTimeZoneToMsMap() {
     map.put("Europe/Jersey", "GMT Standard Time");
     map.put("Europe/Kaliningrad", "Kaliningrad Standard Time");
     map.put("Europe/Kiev", "FLE Standard Time");
+    map.put("Europe/Kirov", "Russian Standard Time");
     map.put("Europe/Lisbon", "GMT Standard Time");
     map.put("Europe/Ljubljana", "Central Europe Standard Time");
     map.put("Europe/London", "GMT Standard Time");
@@ -505,6 +508,7 @@ public static Map<String, String> createOlsonTimeZoneToMsMap() {
     map.put("Europe/Samara", "Russia Time Zone 3");
     map.put("Europe/San_Marino", "W. Europe Standard Time");
     map.put("Europe/Sarajevo", "Central European Standard Time");
+    map.put("Europe/Saratov", "Russia Time Zone 3");
     map.put("Europe/Simferopol", "Russian Standard Time");
     map.put("Europe/Skopje", "Central European Standard Time");
     map.put("Europe/Sofia", "FLE Standard Time");
@@ -512,6 +516,7 @@ public static Map<String, String> createOlsonTimeZoneToMsMap() {
     map.put("Europe/Tallinn", "FLE Standard Time");
     map.put("Europe/Tirane", "Central Europe Standard Time");
     map.put("Europe/Tiraspol", "GTB Standard Time");
+    map.put("Europe/Ulyanovsk", "Russia Time Zone 3");
     map.put("Europe/Uzhgorod", "FLE Standard Time");
     map.put("Europe/Vaduz", "W. Europe Standard Time");
     map.put("Europe/Vatican", "W. Europe Standard Time");