Merge pull request #1 from TodorBalabanov/master

Merge with master fork.
Small cosmetic changes.
Merge pull request #5 from TiaDalma/master

Small changes.