From b1cac6125d3cdae0047475a79e04a80f0cdce1b0 Mon Sep 17 00:00:00 2001
From: Pavan Yalamanchili <pavan@arrayfire.com>
Date: Mon, 16 May 2016 00:19:18 -0400
Subject: [PATCH] Updating changelog and setup.py

---
 CHANGELOG.md | 6 ++++++
 setup.py     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c0b16da3..ea809cd92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v3.3.20160516
+- Bugfix: Increase arrayfire's priority over numpy for mixed operations
+
+- Added new library functions
+   - `get_backend` returns backend name
+
 ### v3.3.20160510
 - Bugfix to `af.histogram`
 
diff --git a/setup.py b/setup.py
index 76a892868..0c4318e32 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 ## 2) Include test suite
 
 # Some hackery to avoid merge conflicts between master and devel
-current_version = "3.3.20160510"
+current_version = "3.3.20160516"
 devel_version = "3.3.0"
 release_version = current_version if current_version > devel_version else devel_version