Merge pull request #16 from ctorstens/development

Development
Merge branch 'master' into vote_features