Merge pull request #119 from sunshinephp/master

Small cleanup after pull from Chris' repo. Some other added/cleanup of code.
Fixed wrong variable.
Merge branch 'master' of github.com:chartjes/opencfp