Marc_commit_2014-03-17
Merge pull request #3 from Marc-Bogonovich/master

Marc_commit_2014-03-17