Fixing merging problems
Merge branch 'master' of ssh://git@github.com/vcaldas/iSBTools.git