Changes in selections to match analysis tools (not sure if this was active anyway) and a couple of bug fixes
Merge pull request #40 from phy6phs/master

Selection changes and bug fixes