Minor tweaks and make the code a bit more flexible by allowing it to take arguments from command line.
Merge pull request #1 from omaciel/master

Minor tweaks and make the code a bit more flexible by allowing it to tak