minor changes before production
Merge pull request #3 from amirent/master

some changes