Made some minor changes and fixes
Merge pull request #6 from rvmladenov/master

Made some minor changes and fixes