fixing merge
Merge pull request #11 from smspezzano/fixing

fixing merge