Fixed Program to be more dynamic

asdf
Merge pull request #1 from Vandenn/master

Fixed Program to be more dynamic