Made options more robust and added README file