wip: a dev based change
Merge pull request #3 from thefury/dev-next

This goes onto the development branch