Merge branch 'development' of github.com:opentox/opentox-client into development

Conflicts:
	lib/compound.rb

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 455e9ad..530296a 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -5,7 +5,7 @@ module OpenTox
 
     # Execute algorithm with parameters, please consult the OpenTox API and the webservice documentation for acceptable parameters
     # @param [optional,Hash] params Algorithm parameters
-    # @param [optional,OpenTox::Task] waiting_task (can be a OpenTox::Subtask as well), progress is updated accordingly
+    # @param [optional,Boolean] set to true if method should wait for task result
     # @return [String] URI of new resource (dataset, model, ...)
     def run params=nil, wait=true
       uri = RestClientWrapper.post @uri, params, { :content_type => "text/uri-list", :subjectid => @subjectid}