updated from dev branch

Signed-off-by: DarkSnake-Kobra <jbttoms@gmail.com>