updates

looks like my pull request from axonpro's repo didn't break anything, merging this with my dev branch.