Dev 1.1 update

And an update for my Dev branch