Merge pull request #1 from nsainati/master

first pull request
Merge pull request #2 from nsainati/master

new code
Fixed show
Merge pull request #1 from agarfinkel2013/master

updates