issue#2: moved command line to seperate file
Issue2: merged changes in master branch