fixed Diana's email
Merge pull request #1 from dporro/master

Some of the detected bugs already fixed
MAC-OS: Fixed issues to make it work on MAC-OS.
Merge pull request #2 from dporro/mac-os

MAC-OS porting