dlaurie Updated README and some bug fixes