diff --git a/MongoRepository/MongoRepository.Net45.csproj b/MongoRepository/MongoRepository.Net45.csproj
index ba89305..a41f79c 100644
--- a/MongoRepository/MongoRepository.Net45.csproj
+++ b/MongoRepository/MongoRepository.Net45.csproj
@@ -40,16 +40,16 @@
     <DocumentationFile>bin\Release\MongoRepository.Net45.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=2.2.0.262, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.2.0\lib\net45\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.2.4.26, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.2.4\lib\net45\MongoDB.Bson.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.2.0.262, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.2.0\lib\net45\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.2.4.26, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.2.4\lib\net45\MongoDB.Driver.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.2.0.262, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.2.0\lib\net45\MongoDB.Driver.Core.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.2.4.26, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.2.4\lib\net45\MongoDB.Driver.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -62,6 +62,7 @@
     <Compile Include="CollectionName.cs" />
     <Compile Include="Entity.cs" />
     <Compile Include="IEntity.cs" />
+    <Compile Include="Repository\IRepositoryAsync.cs" />
     <Compile Include="RepositoryManager\CollectionStatsResult.cs" />
     <Compile Include="RepositoryManager\IRepositoryManager.cs" />
     <Compile Include="RepositoryManager\MongoRepositoryManager.cs" />
@@ -79,6 +80,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Project="..\packages\OctoPack.3.0.71\tools\OctoPack.targets" Condition="Exists('..\packages\OctoPack.3.0.71\tools\OctoPack.targets')" />
+  <Target Name="EnsureOctoPackImported" BeforeTargets="BeforeBuild" Condition="'$(OctoPackImported)' == ''">
+    <Error Condition="!Exists('..\packages\OctoPack.3.0.71\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="You are trying to build with OctoPack, but the NuGet targets file that OctoPack depends on is not available on this computer. This is probably because the OctoPack package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\OctoPack.3.0.71\tools\OctoPack.targets') And ('$(RunOctoPack)' != '' And $(RunOctoPack))" Text="OctoPack cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/MongoRepository/Repository/IRepositoryAsync.cs b/MongoRepository/Repository/IRepositoryAsync.cs
new file mode 100644
index 0000000..92701d3
--- /dev/null
+++ b/MongoRepository/Repository/IRepositoryAsync.cs
@@ -0,0 +1,94 @@
+namespace MongoRepository
+{
+    using MongoDB.Driver;
+    using MongoDB.Driver.Linq;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq.Expressions;
+    using System.Threading.Tasks;
+
+
+    public interface IRepositoryAsync<T, TKey> : IRepository<T, TKey>
+        where T : IEntity<TKey>
+    {
+        Task<T> GetByIdAsync(TKey id);
+
+        /// <summary>
+        /// Returns all of the entities in the repository.
+        /// </summary>
+        /// <returns>A List of type T containing all of the entities in the repository.</returns>
+        Task<List<T>> GetAllAsync();
+
+        /// <summary>
+        /// Adds the new entity in the repository.
+        /// </summary>
+        /// <param name="entity">The entity to add.</param>
+        /// <returns>The added entity including its new ObjectId.</returns>
+        Task<T> AddAsync(T entity);
+
+        /// <summary>
+        /// Adds the new entities in the repository.
+        /// </summary>
+        /// <param name="entities">The entities of type T.</param>
+        Task AddAsync(IEnumerable<T> entities);
+
+        /// <summary>
+        /// Upserts an entity.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <returns>The updated entity.</returns>
+        Task<T> UpdateAsync(T entity);
+
+        /// <summary>
+        /// Upserts the entities.
+        /// </summary>
+        /// <param name="entities">The entities to update.</param>
+        Task UpdateAsync(IEnumerable<T> entities);
+
+        /// <summary>
+        /// Deletes the given entity.
+        /// </summary>
+        /// <param name="entity">The entity to delete.</param>
+        Task<DeleteResult> DeleteAsync(TKey Id);
+        
+        /// <summary>
+        /// Deletes the given entity.
+        /// </summary>
+        /// <param name="entity">The entity to delete.</param>
+        Task<DeleteResult> DeleteAsync(T entity);
+
+        /// <summary>
+        /// Deletes the entities matching the predicate.
+        /// </summary>
+        /// <param name="predicate">The expression.</param>
+        Task<DeleteResult> DeleteAsync(Expression<Func<T, bool>> predicate);
+
+        /// <summary>
+        /// Deletes all entities in the repository.
+        /// </summary>
+        Task<DeleteResult> DeleteAllAsync();
+
+        /// <summary>
+        /// Counts the total entities in the repository.
+        /// </summary>
+        /// <returns>Count of entities in the repository.</returns>
+        Task<long> CountAsync();
+
+        /// <summary>
+        /// Checks if the entity exists for given predicate.
+        /// </summary>
+        /// <param name="predicate">The expression.</param>
+        /// <returns>True when an entity matching the predicate exists, false otherwise.</returns>
+        Task<bool> ExistsAsync(Expression<Func<T, bool>> predicate);
+
+    }
+
+    /// <summary>
+    /// IRepository definition.
+    /// </summary>
+    /// <typeparam name="T">The type contained in the repository.</typeparam>
+    /// <remarks>Entities are assumed to use strings for Id's.</remarks>
+    public interface IRepositoryAsync<T> : IRepositoryAsync<T, string>
+        where T : IEntity<string>
+    { }
+}
diff --git a/MongoRepository/Repository/MongoRepository.cs b/MongoRepository/Repository/MongoRepository.cs
index 787efe3..2262eb8 100644
--- a/MongoRepository/Repository/MongoRepository.cs
+++ b/MongoRepository/Repository/MongoRepository.cs
@@ -2,17 +2,21 @@
 {
     using MongoDB.Bson;
     using MongoDB.Driver;
+    using MongoDB.Driver.Core;
+    using MongoDB.Driver.Linq;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Linq.Expressions;
+    using System.Threading.Tasks;
+    using System.Threading;
 
     /// <summary>
     /// Deals with entities in MongoDb.
     /// </summary>
     /// <typeparam name="T">The type contained in the repository.</typeparam>
     /// <typeparam name="TKey">The type used for the entity's Id.</typeparam>
-    public class MongoRepository<T, TKey> : IRepository<T, TKey>
+    public class MongoRepository<T, TKey> : IRepositoryAsync<T, TKey>
         where T : IEntity<TKey>
     {
         /// <summary>
@@ -100,6 +104,25 @@ public virtual T GetById(TKey id)
             return this.collection.FindSync<T>(GetIDFilter(id)).Single();
         }
 
+        /// <summary>
+        /// Returns all of the entities in the repository.
+        /// </summary>
+        /// <returns>A List of type T containing all of the entities in the repository.</returns>
+        public async virtual Task<List<T>> GetAllAsync()
+        {
+            return await this.collection.Find(new BsonDocument()).ToListAsync();
+        }
+
+        /// <summary>
+        /// Returns the T by its given id.
+        /// </summary>
+        /// <param name="id">The Id of the entity to retrieve.</param>
+        /// <returns>The Entity T.</returns>
+        public async virtual Task<T> GetByIdAsync(TKey id)
+        {
+            return await this.collection.Find<T>(GetIDFilter(id)).SingleAsync();
+        }
+
         /// <summary>
         /// Returns the T by its given id.
         /// </summary>
@@ -110,6 +133,17 @@ public virtual T GetById(ObjectId id)
             return this.collection.FindSync<T>(GetIDFilter(id)).Single();
         }
 
+        /// <summary>
+        /// Returns the T by its given id.
+        /// </summary>
+        /// <param name="id">The Id of the entity to retrieve.</param>
+        /// <returns>The Entity T.</returns>
+        public async virtual Task<T> GetByIdAsync(ObjectId id)
+        {
+            return await this.collection.Find<T>(GetIDFilter(id)).SingleAsync();
+        }
+
+
         /// <summary>
         /// Adds the new entity in the repository.
         /// </summary>
@@ -122,6 +156,20 @@ public virtual T Add(T entity)
             return entity;
         }
 
+
+        /// <summary>
+        /// Adds the new entity in the repository.
+        /// </summary>
+        /// <param name="entity">The entity T.</param>
+        /// <returns>The added entity including its new ObjectId.</returns>
+        public async virtual Task<T> AddAsync(T entity)
+        {
+            await this.collection.InsertOneAsync(entity);
+
+            return entity;
+        }
+
+
         /// <summary>
         /// Adds the new entities in the repository.
         /// </summary>
@@ -131,6 +179,15 @@ public virtual void Add(IEnumerable<T> entities)
             this.collection.InsertMany(entities);
         }
 
+        /// <summary>
+        /// Adds the new entities in the repository.
+        /// </summary>
+        /// <param name="entities">The entities of type T.</param>
+        public async virtual Task AddAsync(IEnumerable<T> entities)
+        {
+            await this.collection.InsertManyAsync(entities);
+        }
+
         /// <summary>
         /// Upserts an entity.
         /// </summary>
@@ -145,6 +202,20 @@ public virtual T Update(T entity)
             return entity;
         }
 
+        /// <summary>
+        /// Upserts an entity.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <returns>The updated entity.</returns>
+        public async virtual Task<T> UpdateAsync(T entity)
+        {
+            if (entity.Id == null)
+                await this.AddAsync(entity);
+            else
+                await this.collection.ReplaceOneAsync(GetIDFilter(entity.Id), entity, new UpdateOptions { IsUpsert = true });
+            return entity;
+        }
+
         /// <summary>
         /// Upserts the entities.
         /// </summary>
@@ -155,6 +226,18 @@ public virtual void Update(IEnumerable<T> entities)
                 this.collection.ReplaceOne(GetIDFilter(entity.Id), entity, new UpdateOptions { IsUpsert = true });
         }
 
+        /// <summary>
+        /// Upserts the entities.
+        /// </summary>
+        /// <param name="entities">The entities to update.</param>
+        public async virtual Task UpdateAsync(IEnumerable<T> entities)
+        {
+            foreach (T entity in entities)
+                await this.collection.ReplaceOneAsync(GetIDFilter(entity.Id), entity, new UpdateOptions { IsUpsert = true });
+        }
+
+
+
         /// <summary>
         /// Deletes an entity from the repository by its id.
         /// </summary>
@@ -164,6 +247,15 @@ public virtual void Delete(TKey id)
             this.collection.DeleteOne(GetIDFilter(id));
         }
 
+        /// <summary>
+        /// Deletes an entity from the repository by its id.
+        /// </summary>
+        /// <param name="id">The entity's id.</param>
+        public async virtual Task<DeleteResult> DeleteAsync(TKey id)
+        {
+            return await this.collection.DeleteOneAsync(GetIDFilter(id));
+        }
+
         /// <summary>
         /// Deletes an entity from the repository by its ObjectId.
         /// </summary>
@@ -173,6 +265,15 @@ public virtual void Delete(ObjectId id)
             this.collection.DeleteOne(GetIDFilter(id));
         }
 
+        /// <summary>
+        /// Deletes an entity from the repository by its ObjectId.
+        /// </summary>
+        /// <param name="id">The ObjectId of the entity.</param>
+        public async virtual Task<DeleteResult> DeleteAsync(ObjectId id)
+        {
+            return await this.collection.DeleteOneAsync(GetIDFilter(id));
+        }
+
         /// <summary>
         /// Deletes the given entity.
         /// </summary>
@@ -182,6 +283,15 @@ public virtual void Delete(T entity)
             this.Delete(entity.Id);
         }
 
+        /// <summary>
+        /// Deletes the given entity.
+        /// </summary>
+        /// <param name="entity">The entity to delete.</param>
+        public async virtual Task<DeleteResult> DeleteAsync(T entity)
+        {
+            return await this.DeleteAsync(entity.Id);
+        }
+
         /// <summary>
         /// Deletes the entities matching the predicate.
         /// </summary>
@@ -191,6 +301,15 @@ public virtual void Delete(Expression<Func<T, bool>> predicate)
             this.collection.DeleteMany<T>(predicate);
         }
 
+        /// <summary>
+        /// Deletes the entities matching the predicate.
+        /// </summary>
+        /// <param name="predicate">The expression.</param>
+        public async virtual Task<DeleteResult> DeleteAsync(Expression<Func<T, bool>> predicate)
+        {
+            return await this.collection.DeleteManyAsync<T>(predicate);
+        }
+
         /// <summary>
         /// Deletes all entities in the repository.
         /// </summary>
@@ -199,6 +318,14 @@ public virtual void DeleteAll()
             this.collection.DeleteMany<T>(t => true);
         }
 
+        /// <summary>
+        /// Deletes all entities in the repository.
+        /// </summary>
+        public async virtual Task<DeleteResult> DeleteAllAsync()
+        {
+            return await this.collection.DeleteManyAsync<T>(t => true);
+        }
+
         /// <summary>
         /// Counts the total entities in the repository.
         /// </summary>
@@ -208,6 +335,15 @@ public virtual long Count()
             return this.collection.Count(t => true);
         }
 
+        /// <summary>
+        /// Counts the total entities in the repository.
+        /// </summary>
+        /// <returns>Count of entities in the collection.</returns>
+        public async virtual Task<long> CountAsync()
+        {
+            return await this.collection.CountAsync(t => true);
+        }
+
         /// <summary>
         /// Checks if the entity exists for given predicate.
         /// </summary>
@@ -218,6 +354,16 @@ public virtual bool Exists(Expression<Func<T, bool>> predicate)
             return this.collection.AsQueryable<T>().Any(predicate);
         }
 
+        /// <summary>
+        /// Checks if the entity exists for given predicate.
+        /// </summary>
+        /// <param name="predicate">The expression.</param>
+        /// <returns>True when an entity matching the predicate exists, false otherwise.</returns>
+        public async virtual Task<bool> ExistsAsync(Expression<Func<T, bool>> predicate)
+        {
+            return await this.collection.AsQueryable().AnyAsync(predicate);
+        }
+
         private static FilterDefinition<T> GetIDFilter(ObjectId id)
         {
             return Builders<T>.Filter.Eq("_id", id);
@@ -272,6 +418,41 @@ public virtual IQueryProvider Provider
         {
             get { return this.collection.AsQueryable<T>().Provider; }
         }
+
+        #region IDisposable Support
+        private bool disposedValue = false; // To detect redundant calls
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    // TODO: dispose managed state (managed objects).
+                }
+
+                // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below.
+                // TODO: set large fields to null.
+
+                disposedValue = true;
+            }
+        }
+
+        // TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources.
+        // ~MongoRepository() {
+        //   // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+        //   Dispose(false);
+        // }
+
+        // This code added to correctly implement the disposable pattern.
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+            Dispose(true);
+            // TODO: uncomment the following line if the finalizer is overridden above.
+            // GC.SuppressFinalize(this);
+        }
+        #endregion
         #endregion
     }
 
@@ -280,7 +461,7 @@ public virtual IQueryProvider Provider
     /// </summary>
     /// <typeparam name="T">The type contained in the repository.</typeparam>
     /// <remarks>Entities are assumed to use strings for Id's.</remarks>
-    public class MongoRepository<T> : MongoRepository<T, string>, IRepository<T>
+    public class MongoRepository<T> : MongoRepository<T, string>, IRepositoryAsync<T>
         where T : IEntity<string>
     {
         /// <summary>
diff --git a/MongoRepository/packages.config b/MongoRepository/packages.config
index bbb5b03..d199ce7 100644
--- a/MongoRepository/packages.config
+++ b/MongoRepository/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MongoDB.Bson" version="2.2.0" targetFramework="net45" />
-  <package id="MongoDB.Driver" version="2.2.0" targetFramework="net45" />
-  <package id="MongoDB.Driver.Core" version="2.2.0" targetFramework="net45" />
+  <package id="MongoDB.Bson" version="2.2.4" targetFramework="net45" />
+  <package id="MongoDB.Driver" version="2.2.4" targetFramework="net45" />
+  <package id="MongoDB.Driver.Core" version="2.2.4" targetFramework="net45" />
+  <package id="OctoPack" version="3.0.71" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/MongoRepositoryTests/RepoTests.cs b/MongoRepositoryTests/RepoTests.cs
index 7fa2100..955d468 100644
--- a/MongoRepositoryTests/RepoTests.cs
+++ b/MongoRepositoryTests/RepoTests.cs
@@ -23,7 +23,7 @@ public void Setup()
         [TestCleanup]
         public void Cleanup()
         {
-            this.DropDB();
+            //this.DropDB();
         }
 
         private void DropDB()
@@ -84,6 +84,58 @@ public void AddAndUpdateTest()
             Assert.IsTrue(_customerRepo.Exists(c => c.HomeAddress.Country == "Alaska"));
         }
 
+
+        [TestMethod]
+        public async void AddAndUpdateAsyncTest()
+        {
+            var _customerRepo = new MongoRepository<Customer>();
+            IRepositoryManager<Customer> _customerMan = new MongoRepositoryManager<Customer>();
+
+            Assert.IsFalse(_customerMan.Exists);
+
+            var customer = new Customer();
+            customer.FirstName = "Bob";
+            customer.LastName = "Dillon";
+            customer.Phone = "0900999899";
+            customer.Email = "Bob.dil@snailmail.com";
+            customer.HomeAddress = new Address
+            {
+                Address1 = "North kingdom 15 west",
+                Address2 = "1 north way",
+                PostCode = "40990",
+                City = "George Town",
+                Country = "Alaska"
+            };
+
+            await _customerRepo.AddAsync(customer);
+
+            Assert.IsTrue(_customerMan.Exists);
+
+            Assert.IsNotNull(customer.Id);
+
+            // fetch it back 
+            var alreadyAddedCustomer = _customerRepo.Where(c => c.FirstName == "Bob").Single();
+
+            Assert.IsNotNull(alreadyAddedCustomer);
+            Assert.AreEqual(customer.FirstName, alreadyAddedCustomer.FirstName);
+            Assert.AreEqual(customer.HomeAddress.Address1, alreadyAddedCustomer.HomeAddress.Address1);
+
+            alreadyAddedCustomer.Phone = "10110111";
+            alreadyAddedCustomer.Email = "dil.bob@fastmail.org";
+
+            await _customerRepo.UpdateAsync(alreadyAddedCustomer);
+
+            // fetch by id now 
+            var updatedCustomer = _customerRepo.GetById(customer.Id);
+
+            Assert.IsNotNull(updatedCustomer);
+            Assert.AreEqual(alreadyAddedCustomer.Phone, updatedCustomer.Phone);
+            Assert.AreEqual(alreadyAddedCustomer.Email, updatedCustomer.Email);
+
+            Assert.IsTrue(_customerRepo.Exists(c => c.HomeAddress.Country == "Alaska"));
+        }
+
+
         [TestMethod]
         public void ComplexEntityTest()
         {