conforming comments
Added license
Merging two branches