marc branch changes
Merge pull request #3 from marc28/marc

marc branch changes