Updated to latest Android SDK version 23 and fixed json output