Closes #3, closes #4 and README updates