Added more functionality, improved readme.