Official code modified by Lotem.
Merge branch 'develop' of github.com:tramhao/weasel into develop