Solved #2 and updated readme files.