Minor improvements
Merge pull request #11 from alecxe/patch-1

Minor improvements