Merge pull request #4 from He-Ro/minor-fixes