diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84ece5d..87c5824 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,15 +91,24 @@ cm_example_project("chart" DistributionChart2D)
 add_executable(TimeCount time/time_count.cpp)
 cm_example_project("time" TimeCount)
 ####################################################################################################
-add_executable(AndroidDeviceAnalysis    android/AndroidDeviceAnalysis/main.cpp
-					                    android/AndroidDeviceAnalysis/GameRecord.h
-                                        android/AndroidDeviceAnalysis/GameRecord.cpp
-                                        android/AndroidDeviceAnalysis/ParseDeviceID.cpp
+SET(ADA_LOAD_SOURCE                     android/AndroidDeviceAnalysis/ParseDeviceID.cpp
                                         android/AndroidDeviceAnalysis/ParseScreenSize.cpp
                                         android/AndroidDeviceAnalysis/ParseDateTime.cpp
                                         android/AndroidDeviceAnalysis/ParseAndroidVersion.cpp
                                         android/AndroidDeviceAnalysis/ParseNumber.cpp
-                                        android/AndroidDeviceAnalysis/LoadRecordFile.cpp)
+                                        android/AndroidDeviceAnalysis/LoadRecordFile.cpp
+                                        android/AndroidDeviceAnalysis/EnumCSVFile.cpp
+)
+
+source_group("Load" FILES ${ADA_LOAD_SOURCE})
+
+add_executable(AndroidDeviceAnalysis    android/AndroidDeviceAnalysis/main.cpp
+					                    android/AndroidDeviceAnalysis/GameRecord.h
+                                        android/AndroidDeviceAnalysis/GameRecord.cpp
+                                        android/AndroidDeviceAnalysis/AndroidDeviceRecord.cpp
+#                                        android/AndroidDeviceAnalysis/ExportReport.cpp
+                                        ${ADA_LOAD_SOURCE})
+
 cm_example_project("android" AndroidDeviceAnalysis)
 
 ####################################################################################################
diff --git a/DistributionChart2D.cpp b/DistributionChart2D.cpp
index 668f6a5..9eaf595 100644
--- a/DistributionChart2D.cpp
+++ b/DistributionChart2D.cpp
@@ -418,8 +418,8 @@ public:
 
         uint low,high,gap;
         
-        ColorGradient.GetLowest(low);
-        ColorGradient.GetHighest(high);
+        ColorGradient.GetLowestPosition(low);
+        ColorGradient.GetHighestPosition(high);
 
         gap=high-low;
 
diff --git a/android/AndroidDeviceAnalysis b/android/AndroidDeviceAnalysis
index 8fdb442..a3ae435 160000
--- a/android/AndroidDeviceAnalysis
+++ b/android/AndroidDeviceAnalysis
@@ -1 +1 @@
-Subproject commit 8fdb442ef22b0c2d6944aa7d9750a93be6d5d2da
+Subproject commit a3ae4350aa89d6a9b00a327adad6e222eb178e23