Merge pull request #1 from nimavakili/develop

minor fixes here and there