diff --git a/source/f90/eels-boson.f90 b/source/f90/eels-boson.f90
index 0346f78dfdd404b03dc42a4f7cf32bf0320de5ca..ef0593977f9f2b355f650b2989eeb79c2856d8f1 100644
--- a/source/f90/eels-boson.f90
+++ b/source/f90/eels-boson.f90
@@ -8,6 +8,8 @@ program eels_boson
 ! *                                                                *
 ! ******************************************************************
 
+  use get_commandline_options_mod
+
   implicit none
 
   include 'version.inc'
diff --git a/source/f90/get_commandline_options.f90 b/source/f90/get_commandline_options.f90
index e3448faee6f10ef5c9861a7a14f12786787c0c74..6aac3225c544913c3d71061f0c4ebc1e69b58086 100644
--- a/source/f90/get_commandline_options.f90
+++ b/source/f90/get_commandline_options.f90
@@ -1,3 +1,5 @@
+module get_commandline_options_mod
+contains
 subroutine get_commandline_options(eelsin_name, eelsou_name, bosin_name, bosou_name)
 
 ! This routine defines the commandline options, parses the commandline and sets the 
@@ -11,7 +13,8 @@ subroutine get_commandline_options(eelsin_name, eelsou_name, bosin_name, bosou_n
 
   implicit none
   
-  character (len = *) :: eelsin_name, eelsou_name, bosin_name, bosou_name
+  character (len = :), allocatable, intent(in out) :: eelsin_name, eelsou_name
+  character (len = :), allocatable, intent(in out) :: bosin_name, bosou_name
     
   include 'version.inc'
 
@@ -87,3 +90,4 @@ subroutine get_commandline_options(eelsin_name, eelsou_name, bosin_name, bosou_n
   
   return
 end subroutine get_commandline_options
+end module get_commandline_options_mod