Small fixes
Merge pull request #5 from ei-grad/develop

Small fixes