diff --git a/binding-mri/filesystem-binding.cpp b/binding-mri/filesystem-binding.cpp
index 4bc5e03..f45d564 100644
--- a/binding-mri/filesystem-binding.cpp
+++ b/binding-mri/filesystem-binding.cpp
@@ -129,7 +129,7 @@ kernelLoadDataInt(const char *filename, bool rubyExc)
 
 	VALUE port = fileIntForPath(filename, rubyExc);
 
-	VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal"));
+	VALUE marsh = rb_const_get(rb_cObject, rb_intern("PureRubyMarshal"));
 
 	// FIXME need to catch exceptions here with begin rescue
 	VALUE result = rb_funcall2(marsh, rb_intern("load"), 1, &port);
diff --git a/binding-mri/graphics-binding.cpp b/binding-mri/graphics-binding.cpp
index 6b39697..d8a874e 100644
--- a/binding-mri/graphics-binding.cpp
+++ b/binding-mri/graphics-binding.cpp
@@ -201,6 +201,7 @@ DEF_GRA_PROP_I(Brightness)
 
 DEF_GRA_PROP_B(Fullscreen)
 DEF_GRA_PROP_B(ShowCursor)
+DEF_GRA_PROP_B(Smooth)
 
 #define INIT_GRA_PROP_BIND(PropName, prop_name_s) \
 { \
@@ -242,4 +243,5 @@ void graphicsBindingInit()
 
 	INIT_GRA_PROP_BIND( Fullscreen, "fullscreen"  );
 	INIT_GRA_PROP_BIND( ShowCursor, "show_cursor" );
+	INIT_GRA_PROP_BIND( Smooth,     "smooth"      );
 }
diff --git a/src/graphics.cpp b/src/graphics.cpp
index ef70267..0f921ef 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -1036,6 +1036,16 @@ void Graphics::setFullscreen(bool value)
 	p->threadData->ethread->requestFullscreenMode(value);
 }
 
+bool Graphics::getSmooth() const
+{
+	return p->threadData->config.smoothScaling;
+}
+
+void Graphics::setSmooth(bool value)
+{
+	p->threadData->config.smoothScaling = value;
+}
+
 bool Graphics::getShowCursor() const
 {
 	return p->threadData->ethread->getShowCursor();
diff --git a/src/graphics.h b/src/graphics.h
index 46f8204..c52f95d 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -62,6 +62,7 @@ public:
 	/* Non-standard extension */
 	DECL_ATTR( Fullscreen, bool )
 	DECL_ATTR( ShowCursor, bool )
+	DECL_ATTR( Smooth,     bool )
 
 	/* <internal> */
 	Scene *getScreen() const;