under construction
refactered a little
fixed README.md