fixing a problem i caused with @evana13g s page
fixing merge problem
Merge pull request #177 from jdalphon/master

Fixing issue with bad merge