Merge pull request #9 from perezhk/master

fix some bugs
fix market problem + fix ww problem - now can go to ww