Merge pull request #3 from TodorBalabanov/master