second commit

working copyW
Merge pull request #2 from seanot/cristian

second commit