Update readme

With these updates we should be able to close issues numbers #3 and #8