diff --git a/python/plugins/sextante/modeler/ModelerAlgorithmProvider.py b/python/plugins/sextante/modeler/ModelerAlgorithmProvider.py
@@ -64,15 +64,20 @@ def getIcon(self):
         return QtGui.QIcon(os.path.dirname(__file__) + "/../images/model.png")
 
     def _loadAlgorithms(self):
-        folder = ModelerUtils.modelsFolder()
+        folder = ModelerUtils.modelsFolder()  
+        self.loadFromFolder(folder)      
+        folder = os.path.join(os.path.dirname(__file__), "models")
+        self.loadFromFolder(folder)  
+
+    def loadFromFolder(self,folder):
         for descriptionFile in os.listdir(folder):
             if descriptionFile.endswith("model"):
                 try:
                     alg = ModelerAlgorithm()
-                    fullpath = os.path.join(ModelerUtils.modelsFolder(),descriptionFile)
+                    fullpath = os.path.join(folder ,descriptionFile)
                     alg.openModel(fullpath)
                     if alg.name.strip() != "":
                         alg.provider = self
                         self.algs.append(alg)
                 except WrongModelException,e:
-                    SextanteLog.addToLog(SextanteLog.LOG_ERROR,"Could not load model " + descriptionFile + "\n" + e.msg)
+                    SextanteLog.addToLog(SextanteLog.LOG_ERROR,"Could not load model " + descriptionFile + "\n" + e.msg)                    
diff --git a/python/plugins/sextante/modeler/ModelerUtils.py b/python/plugins/sextante/modeler/ModelerUtils.py
@@ -24,7 +24,7 @@
 __revision__ = '$Format:%H$'
 
 import os
-from sextante.core.SextanteUtils import mkdir
+from sextante.core.SextanteUtils import mkdir, SextanteUtils
 from sextante.core.SextanteConfig import SextanteConfig
 
 class ModelerUtils:

diff --git a/python/plugins/sextante/r/RAlgorithmProvider.py b/python/plugins/sextante/r/RAlgorithmProvider.py
@@ -69,10 +69,16 @@ def getName(self):
 
     def _loadAlgorithms(self):
         folder = RUtils.RScriptsFolder()
+        self.loadFromFolder(folder)
+        folder = os.path.join(os.path.dirname(__file__), "scripts")
+        self.loadFromFolder(folder)
+
+
+    def loadFromFolder(self, folder):
         for descriptionFile in os.listdir(folder):
             if descriptionFile.endswith("rsx"):
                 try:
-                    fullpath = os.path.join(RUtils.RScriptsFolder(), descriptionFile)
+                    fullpath = os.path.join(folder, descriptionFile)
                     alg = RAlgorithm(fullpath)
                     if alg.name.strip() != "":
                         self.algs.append(alg)

diff --git a/python/plugins/sextante/script/ScriptAlgorithmProvider.py b/python/plugins/sextante/script/ScriptAlgorithmProvider.py
@@ -66,6 +66,11 @@ def getDescription(self):
 
     def _loadAlgorithms(self):
         folder = self.scriptsFolder()
+        self.loadFromFolder(folder)
+        folder = os.path.join(os.path.dirname(__file__), "scripts")
+        self.loadFromFolder(folder)
+
+    def loadFromFolder(self, folder):
         for descriptionFile in os.listdir(folder):
             if descriptionFile.endswith("py"):
                 try: