Correcting code and eliminate some of the problems
Merge pull request #19 from roomezonline/master

Correcting code and eliminate some of the problems