Revert "Runing on Mac"

This reverts commit a359095b0451fb24bb61af4d7561c6822c7dc613.
Revert "Revert "Runing on Mac""

This reverts commit f3a8c470e29fa9e33926a59d52b6b99d96da3bcd.
Merge origin/master
Go Home 27/06/2014