Bad netbeans...
Merge master into IDnaSequence