Fixed bugs, style issues.
Merge pull request #1 from yovadia12/master

Fixed bugs, style issues.