diff --git a/app/services/autocomplete_service.rb b/app/services/autocomplete_service.rb
index 086c1ff114b70a3e50b613e09c5a2e70fe0e504a..8aefd38cceaa328dd24dd495bacc76bfeb86b5f5 100644
--- a/app/services/autocomplete_service.rb
+++ b/app/services/autocomplete_service.rb
@@ -6,6 +6,6 @@ class AutocompleteService
   end
 
   def query(query)
-    return open( "#{@url}:#{@port}?q=#{query}" ).read
+    return open( "#{@url}:#{@port}?q=#{query.downcase}" ).read
   end
 end
diff --git a/autocomplete/src/main.cpp b/autocomplete/src/main.cpp
index f4c7323c3481f6d37d36cd027d90aab4372dc1ac..0fc5a90771dacf248f915cb868d17c4190f9366f 100644
--- a/autocomplete/src/main.cpp
+++ b/autocomplete/src/main.cpp
@@ -44,12 +44,15 @@ using namespace std;
 
 
 int main(int argc, char ** argv) {
-	if ( argc != 3 ){
-		cerr << "Usage: " << argv[0] << " <dicionary:file_url> <port:int>\n";
+	if ( argc < 2 ){
+		cerr << "Usage: " << argv[0] << " <string dicionary=../brazilian.txt> <int port=4242>\n";
 		return 1;
 	}
 	
-	int port = atoi(argv[2]);
+	int port = 4242;
+	if ( argc > 2 ){
+		port = atoi(argv[2]);
+	}
 	EmbeddedServer server(argv[1], port);
 	while(1)
 		sleep(100);