Adding argument parsing, resolves issue #65