fixes fallout duplication from merge conflict
Merge pull request #21 from tiger-swallowtails-2013/merger

fixes fallout duplication from merge conflict