Revert "Develop"
Merge pull request #5 from TO2-2014-Kosci/revert-4-develop

Revert "Develop"