Addresses unicode issues in Python 3
Fixes #79
Merge master and fix merge conflict

Signed-off-by: Aniket Pant <me@aniketpant.com>