Merge pull request #67 from dreamteam69/master

Bump version, add in selection validation
Tidy up some variables