merged in changes and fixes, added readme