diff --git a/include/Clip.h b/include/Clip.h
index 09940678..b4e6688d 100644
--- a/include/Clip.h
+++ b/include/Clip.h
@@ -89,16 +89,16 @@ namespace openshot {
 		AnchorType anchor; ///<The anchor determines what parent a clip should snap to
 
 		/// Get basic properties
-		float get_position() { return position; } ///<Get position on timeline
-		int get_layer() { return layer; } ///<Get layer of clip on timeline (lower number is covered by higher numbers)
-		float get_start() { return start; } ///<Get start position of clip (trim start of video)
-		float get_end() { return end; } ///<Get end position of clip (trim end of video)
+		float Position() { return position; } ///<Get position on timeline
+		int Layer() { return layer; } ///<Get layer of clip on timeline (lower number is covered by higher numbers)
+		float Start() { return start; } ///<Get start position of clip (trim start of video)
+		float End() { return end; } ///<Get end position of clip (trim end of video)
 
 		/// Set basic properties
-		void set_position(float value) { position = value; } ///<Get position on timeline
-		void set_layer(int value) { layer = value; } ///<Get layer of clip on timeline (lower number is covered by higher numbers)
-		void set_start(float value) { start = value; } ///<Get start position of clip (trim start of video)
-		void set_end(float value) { end = value; } ///<Get end position of clip (trim end of video)
+		void Position(float value) { position = value; } ///<Get position on timeline
+		void Layer(int value) { layer = value; } ///<Get layer of clip on timeline (lower number is covered by higher numbers)
+		void Start(float value) { start = value; } ///<Get start position of clip (trim start of video)
+		void End(float value) { end = value; } ///<Get end position of clip (trim end of video)
 
 		// Scale and Location curves
 		Keyframe scale_x; ///<Curve representing the horizontal scaling in percent (0 to 100)
diff --git a/include/KeyFrame.h b/include/KeyFrame.h
index 787cdc44..8ed365de 100644
--- a/include/KeyFrame.h
+++ b/include/KeyFrame.h
@@ -76,6 +76,9 @@ namespace openshot {
 		/// Add a new point on the key-frame.  Each point has a primary coordinate, a left handle, and a right handle.
 		void AddPoint(Point p);
 
+		/// Add a new point on the key-frame, with some defaults set (BEZIER, AUTO Handles, etc...)
+		void AddPoint(float x, float y);
+
 		/// Set the handles, used for smooth curves.  The handles are based on the surrounding points.
 		void SetHandles(Point current);
 
@@ -83,7 +86,7 @@ namespace openshot {
 		int FindIndex(Point p) throw(OutOfBoundsPoint);
 
 		/// Get the value at a specific index
-		Coordinate GetValue(int index);
+		float GetValue(int index);
 
 		/// Get a point at a specific index
 		Point& GetPoint(int index) throw(OutOfBoundsPoint);
diff --git a/include/Point.h b/include/Point.h
index d691907c..0cc53fb1 100644
--- a/include/Point.h
+++ b/include/Point.h
@@ -65,6 +65,9 @@ namespace openshot
 		/// Constructor which also creates a Point and sets the X and Y of the Point.
 		Point(float x, float y);
 
+		/// Constructor which also creates a Point and sets the X,Y, and interpolation of the Point.
+		Point(float x, float y, Interpolation_Type interpolation);
+
 		// Constructor which takes a coordinate
 		Point(Coordinate co);
 
diff --git a/src/Clip.cpp b/src/Clip.cpp
index 805c6006..17f5e397 100644
--- a/src/Clip.cpp
+++ b/src/Clip.cpp
@@ -6,10 +6,10 @@ using namespace openshot;
 void Clip::init_settings()
 {
 	// Init clip settings
-	set_position(0.0);
-	set_layer(0);
-	set_start(0.0);
-	set_end(0.0);
+	Position(0.0);
+	Layer(0);
+	Start(0.0);
+	End(0.0);
 	gravity = CENTER;
 	scale = FIT;
 	anchor = CANVAS;
diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp
index 3bf954c3..c3074f9b 100644
--- a/src/KeyFrame.cpp
+++ b/src/KeyFrame.cpp
@@ -9,9 +9,9 @@
 using namespace std;
 using namespace openshot;
 
-/// Because points can be added in any order, we need to reorder them
-/// in ascending order based on the point.co.X value.  This simplifies
-/// processing the curve, due to all the points going from left to right.
+// Because points can be added in any order, we need to reorder them
+// in ascending order based on the point.co.X value.  This simplifies
+// processing the curve, due to all the points going from left to right.
 void Keyframe::ReorderPoints() {
 	// Loop through all coordinates, and sort them by the X attribute
 	for (int x = 0; x < Points.size(); x++) {
@@ -42,14 +42,14 @@ Keyframe::Keyframe(float value) : Auto_Handle_Percentage(0.4f) {
 	AddPoint(Point(value));
 }
 
-/// Keyframe constructor
+// Keyframe constructor
 Keyframe::Keyframe() : Auto_Handle_Percentage(0.4f) {
 	// Init the factorial table, needed by bezier curves
 	CreateFactorialTable();
 }
 
-/// Add a new point on the key-frame.  Each point has a primary coordinate,
-/// a left handle, and a right handle.
+// Add a new point on the key-frame.  Each point has a primary coordinate,
+// a left handle, and a right handle.
 void Keyframe::AddPoint(Point p) {
 	// Add point at correct spot
 	Points.push_back(p);
@@ -64,8 +64,18 @@ void Keyframe::AddPoint(Point p) {
 	Process();
 }
 
-/// Set the handles, used for smooth curves.  The handles are based
-/// on the surrounding points.
+// Add a new point on the key-frame, with some defaults set (BEZIER, AUTO Handles, etc...)
+void Keyframe::AddPoint(float x, float y)
+{
+	// Create a point
+	Point new_point(x, y, BEZIER);
+
+	// Add the point
+	AddPoint(new_point);
+}
+
+// Set the handles, used for smooth curves.  The handles are based
+// on the surrounding points.
 void Keyframe::SetHandles(Point current)
 {
 	// Lookup the index of this point
@@ -124,21 +134,21 @@ int Keyframe::FindIndex(Point p) throw(OutOfBoundsPoint) {
 }
 
 // Get the value at a specific index
-Coordinate Keyframe::GetValue(int index)
+float Keyframe::GetValue(int index)
 {
 	// Is index a valid point?
 	if (index >= 0 && index < Values.size())
 		// Return value
-		return Values[index];
+		return Values[index].Y;
 	else if (index < 0 && Values.size() > 0)
 		// Return the minimum value
-		return Coordinate(index, Values[0].Y);
+		return Values[0].Y;
 	else if (index >= Values.size() && Values.size() > 0)
 		// return the maximum value
-		return Coordinate(index, Values[Values.size() - 1].Y);
+		return Values[Values.size() - 1].Y;
 	else
 		// return a blank coordinate (0,0)
-		return Coordinate(0,0);
+		return 0.0;
 }
 
 // Get a point at a specific index
diff --git a/src/Point.cpp b/src/Point.cpp
index 4111f791..dfa89ba3 100644
--- a/src/Point.cpp
+++ b/src/Point.cpp
@@ -28,6 +28,16 @@ Point::Point(float x, float y) :
 	Initialize_Handles();
 }
 
+// Constructor which also creates a Point and sets the X,Y, and interpolation of the Point.
+Point::Point(float x, float y, Interpolation_Type interpolation) :
+	handle_type(AUTO), interpolation(interpolation) {
+	// set new coorinate
+	co = Coordinate(x, y);
+
+	// set handles
+	Initialize_Handles();
+}
+
 Point::Point(Coordinate co) :
 	co(co), interpolation(BEZIER), handle_type(AUTO) {
 	// set handles
diff --git a/tests/KeyFrame_Tests.cpp b/tests/KeyFrame_Tests.cpp
index 5935670a..63deaaea 100644
--- a/tests/KeyFrame_Tests.cpp
+++ b/tests/KeyFrame_Tests.cpp
@@ -61,13 +61,13 @@ TEST(Keyframe_GetValue_For_Bezier_Curve_2_Points)
 	kf.AddPoint(openshot::Point(Coordinate(50, 4), BEZIER));
 
 	// Spot check values from the curve
-	CHECK_CLOSE(1.0f, kf.GetValue(-1).Y, 0.0001);
-	CHECK_CLOSE(1.0f, kf.GetValue(0).Y, 0.0001);
-	CHECK_CLOSE(1.00023f, kf.GetValue(1).Y, 0.0001);
-	CHECK_CLOSE(1.18398f, kf.GetValue(9).Y, 0.0001);
-	CHECK_CLOSE(1.99988f, kf.GetValue(20).Y, 0.0001);
-	CHECK_CLOSE(3.75424f, kf.GetValue(40).Y, 0.0001);
-	CHECK_CLOSE(4.0f, kf.GetValue(50).Y, 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(-1), 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(0), 0.0001);
+	CHECK_CLOSE(1.00023f, kf.GetValue(1), 0.0001);
+	CHECK_CLOSE(1.18398f, kf.GetValue(9), 0.0001);
+	CHECK_CLOSE(1.99988f, kf.GetValue(20), 0.0001);
+	CHECK_CLOSE(3.75424f, kf.GetValue(40), 0.0001);
+	CHECK_CLOSE(4.0f, kf.GetValue(50), 0.0001);
 	// Check the expected number of values
 	CHECK_EQUAL(kf.Values.size(), 51);
 }
@@ -84,14 +84,14 @@ TEST(Keyframe_GetValue_For_Bezier_Curve_5_Points_40_Percent_Handle)
 	kf.AddPoint(openshot::Point(Coordinate(200, 3), BEZIER));
 
 	// Spot check values from the curve
-	CHECK_CLOSE(kf.GetValue(-1).Y, 1.0f, 0.0001);
-	CHECK_CLOSE(1.0f, kf.GetValue(0).Y, 0.0001);
-	CHECK_CLOSE(1.00023f, kf.GetValue(1).Y, 0.0001);
-	CHECK_CLOSE(2.69174f, kf.GetValue(27).Y, 0.0001);
-	CHECK_CLOSE(7.46386f, kf.GetValue(77).Y, 0.0001);
-	CHECK_CLOSE(4.22691f, kf.GetValue(127).Y, 0.0001);
-	CHECK_CLOSE(1.73193f, kf.GetValue(177).Y, 0.0001);
-	CHECK_CLOSE(3.0f, kf.GetValue(200).Y, 0.0001);
+	CHECK_CLOSE(kf.GetValue(-1), 1.0f, 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(0), 0.0001);
+	CHECK_CLOSE(1.00023f, kf.GetValue(1), 0.0001);
+	CHECK_CLOSE(2.69174f, kf.GetValue(27), 0.0001);
+	CHECK_CLOSE(7.46386f, kf.GetValue(77), 0.0001);
+	CHECK_CLOSE(4.22691f, kf.GetValue(127), 0.0001);
+	CHECK_CLOSE(1.73193f, kf.GetValue(177), 0.0001);
+	CHECK_CLOSE(3.0f, kf.GetValue(200), 0.0001);
 	// Check the expected number of values
 	CHECK_EQUAL(kf.Values.size(), 201);
 }
@@ -108,14 +108,14 @@ TEST(Keyframe_GetValue_For_Bezier_Curve_5_Points_25_Percent_Handle)
 	kf.AddPoint(openshot::Point(Coordinate(200, 3), BEZIER));
 
 	// Spot check values from the curve
-	CHECK_CLOSE(1.0f, kf.GetValue(-1).Y, 0.0001);
-	CHECK_CLOSE(1.0f, kf.GetValue(0).Y, 0.0001);
-	CHECK_CLOSE(1.0009f, kf.GetValue(1).Y, 0.0001);
-	CHECK_CLOSE(2.64678f, kf.GetValue(27).Y, 0.0001);
-	CHECK_CLOSE(7.37597f, kf.GetValue(77).Y, 0.0001);
-	CHECK_CLOSE(4.37339f, kf.GetValue(127).Y, 0.0001);
-	CHECK_CLOSE(1.68798f, kf.GetValue(177).Y, 0.0001);
-	CHECK_CLOSE(3.0f, kf.GetValue(200).Y, 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(-1), 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(0), 0.0001);
+	CHECK_CLOSE(1.0009f, kf.GetValue(1), 0.0001);
+	CHECK_CLOSE(2.64678f, kf.GetValue(27), 0.0001);
+	CHECK_CLOSE(7.37597f, kf.GetValue(77), 0.0001);
+	CHECK_CLOSE(4.37339f, kf.GetValue(127), 0.0001);
+	CHECK_CLOSE(1.68798f, kf.GetValue(177), 0.0001);
+	CHECK_CLOSE(3.0f, kf.GetValue(200), 0.0001);
 	// Check the expected number of values
 	CHECK_EQUAL(kf.Values.size(), 201);
 }
@@ -130,13 +130,13 @@ TEST(Keyframe_GetValue_For_Linear_Curve_3_Points)
 	kf.AddPoint(openshot::Point(Coordinate(50, 2), LINEAR));
 
 	// Spot check values from the curve
-	CHECK_CLOSE(1.0f, kf.GetValue(-1).Y, 0.0001);
-	CHECK_CLOSE(1.0f, kf.GetValue(0).Y, 0.0001);
-	CHECK_CLOSE(1.0f, kf.GetValue(1).Y, 0.0001);
-	CHECK_CLOSE(3.33333f, kf.GetValue(9).Y, 0.0001);
-	CHECK_CLOSE(6.54167f, kf.GetValue(20).Y, 0.0001);
-	CHECK_CLOSE(4.4f, kf.GetValue(40).Y, 0.0001);
-	CHECK_CLOSE(2.0f, kf.GetValue(50).Y, 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(-1), 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(0), 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(1), 0.0001);
+	CHECK_CLOSE(3.33333f, kf.GetValue(9), 0.0001);
+	CHECK_CLOSE(6.54167f, kf.GetValue(20), 0.0001);
+	CHECK_CLOSE(4.4f, kf.GetValue(40), 0.0001);
+	CHECK_CLOSE(2.0f, kf.GetValue(50), 0.0001);
 	// Check the expected number of values
 	CHECK_EQUAL(kf.Values.size(), 51);
 }
@@ -151,14 +151,14 @@ TEST(Keyframe_GetValue_For_Constant_Curve_3_Points)
 	kf.AddPoint(openshot::Point(Coordinate(50, 2), CONSTANT));
 
 	// Spot check values from the curve
-	CHECK_CLOSE(1.0f, kf.GetValue(-1).Y, 0.0001);
-	CHECK_CLOSE(1.0f, kf.GetValue(0).Y, 0.0001);
-	CHECK_CLOSE(1.0f, kf.GetValue(1).Y, 0.0001);
-	CHECK_CLOSE(1.0f, kf.GetValue(24).Y, 0.0001);
-	CHECK_CLOSE(8.0f, kf.GetValue(25).Y, 0.0001);
-	CHECK_CLOSE(8.0f, kf.GetValue(40).Y, 0.0001);
-	CHECK_CLOSE(8.0f, kf.GetValue(49).Y, 0.0001);
-	CHECK_CLOSE(2.0f, kf.GetValue(50).Y, 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(-1), 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(0), 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(1), 0.0001);
+	CHECK_CLOSE(1.0f, kf.GetValue(24), 0.0001);
+	CHECK_CLOSE(8.0f, kf.GetValue(25), 0.0001);
+	CHECK_CLOSE(8.0f, kf.GetValue(40), 0.0001);
+	CHECK_CLOSE(8.0f, kf.GetValue(49), 0.0001);
+	CHECK_CLOSE(2.0f, kf.GetValue(50), 0.0001);
 	// Check the expected number of values
 	CHECK_EQUAL(kf.Values.size(), 51);
 }