diff --git a/configure.ac b/configure.ac
index 06f6300..11dce1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT(calcelestial, 0.4, post@steffenvogel.de)
+AC_INIT(Calcelestial, 0.5, https://github.com/stv0g/calcelestial/issues, calcelestial, https://github.com/stv0g/calcelestial)
 AC_CONFIG_SRCDIR([src/calcelestial.c])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/src/calcelestial.c b/src/calcelestial.c
index ffb23d6..520cc92 100644
--- a/src/calcelestial.c
+++ b/src/calcelestial.c
@@ -86,13 +86,13 @@ static const char *long_options_descs[] = {
 	"show version"
 };
 
-void version()
+void print_version()
 {
 	printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
 	printf("libnova %s\n", LIBNOVA_VERSION);
 }
 
-void usage()
+void print_usage()
 {
 	printf("Usage:\n  %s [options]\n\n", PACKAGE_NAME);
 	printf("Options:\n");
@@ -104,17 +104,20 @@ void usage()
 		op++;
 		desc++;
 	}
+	printf("\n");
+	
+	printf("Note: A combination of --lat & --lon or --query is required.\n\n");
 	
 	print_format_tokens();
 
-	printf("\nA combination of --lat & --lon or --query is required.\n");
+	printf("%s is written by Steffen Vogel <post@steffenvogel.de>\n", PACKAGE_NAME);
 	printf("Please report bugs to: %s\n", PACKAGE_BUGREPORT);
 }
 
 void usage_error(const char *err)
 {
 	fprintf(stderr, "Error: %s\n\n", err);
-	usage();
+	print_usage();
 	exit(-1);
 }
 
@@ -242,11 +245,11 @@ int main(int argc, char *argv[])
 				break;
 
 			case 'v':
-				version();
+				print_version();
 				return 0;
 
 			case 'h':
-				usage();
+				print_usage();
 				return 0;
 
 			case '?':