Merge pull request #7 from viebel/yehonathan

Yehonathan
Merge pull request #8 from viebel/yehonathan

Yehonathan
Merge pull request #9 from viebel/yehonathan

Yehonathan
Merge branch 'master' into yehonathan