Finished adding support for user defined variables
Update readme