removed x
removed bypass
Merge pull request #12 from tsagi/develop

Develop