Fix a system args error and simplify the code.
Merge pull request #15 from jemygraw/master

Fix a system args error and simplify the code.