Merge pull request #39 from bzindovic/bzindovic-part1-clarification