diff --git a/lib/yaggo/parser.rb b/lib/yaggo/parser.rb
index 9bbdd8b..986937b 100644
--- a/lib/yaggo/parser.rb
+++ b/lib/yaggo/parser.rb
@@ -113,10 +113,11 @@ class #{class_name} {
   end
 
   # Constructors and initialization
-  h.puts("", "  #{class_name}() :")
-  h.puts("    " + ($options + $args).map { |o| o.init }.join(",\n    "), "  { }")
-  h.puts("", "  #{class_name}(int argc, char* argv[]) :")
-  h.puts("    " + ($options + $args).map { |o| o.init }.join(",\n    "))
+  h.puts("", "  #{class_name}()")
+  h.puts("    :" + ($options + $args).map { |o| o.init }.join("\n    ,")) unless $options.empty? && $args.empty?
+  h.puts("  { }")
+  h.puts("", "  #{class_name}(int argc, char* argv[])")
+  h.puts("    :" + ($options + $args).map { |o| o.init }.join("\n    ,")) unless $options.empty? && $args.empty?
   h.puts("  { parse(argc, argv); }", "");
 
   # Main arsing function
diff --git a/lib/yaggo/version.rb b/lib/yaggo/version.rb
index 6c4dc10..19ec45e 100644
--- a/lib/yaggo/version.rb
+++ b/lib/yaggo/version.rb
@@ -1 +1 @@
-$yaggo_version = "1.5.10"
+$yaggo_version = "1.5.11"