Merge pull request #28 from najela/master

Updating
testing
clean up
Solved all the issues