Merge pull request #12 from houbena/push_test

---
Merge branch 'branch_1'
Merge branch 'master' into branch_1
Merge branch 'branch_1'