Added parameters to be more Android-friendly (different config file
locations, etc)