Merge pull request #107 from andrewnicols/removeLabelsFix