Fixed issue #2: Added copyright and license information
Merged changes with my_mac branch
Trying to merge my_win and my_mac