merge new branch into master

@Jayklutch