fixes #2
more changes for #2
Merge pull request #3 from cheempz/con

Con