Merge pull request #2 from TodorBalabanov/master

Merge with master fork.