Bugs solved.
Merge pull request #82 from PlumLabs/lg/bugsSolve

Bugs solved