a bug with the last code that was pushed
Merge pull request #160 from adamarla/master

a bug with the last code that was pushed