diff --git a/cs658/final/util/Makefile b/cs658/final/util/Makefile
index 35d7e39..31460bf 100644
--- a/cs658/final/util/Makefile
+++ b/cs658/final/util/Makefile
@@ -6,5 +6,15 @@ all: $(OBJS)
 %.o: %.cc
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
+# Make dependency files
+%.dep: %.cc
+	@set -e; rm -f $@; \
+	  $(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
+	  sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	  rm -f $@.$$$$
+
 clean:
-	-$(RM) -f *.o $(ARCHIVE)
+	-$(RM) -f *.o *.dep $(ARCHIVE)
+
+# Include dependency files
+include $(OBJS:.o=.dep)
diff --git a/cs658/final/util/Ray.h b/cs658/final/util/Ray.h
index e3b9a4c..93b5ff0 100644
--- a/cs658/final/util/Ray.h
+++ b/cs658/final/util/Ray.h
@@ -9,6 +9,8 @@ class Ray
     public:
         Ray();
         Ray(const Vector & origin, const Vector & direction);
+        Vector getOrigin() const { return m_origin; }
+        Vector getDirection() const { return m_direction; }
 
     private:
         Vector  m_origin;