Fixed conflicts
Merge pull request #61 from CruGlobal/blockMergeConflicts

Fixed conflicts