Pull Changes back from JanX2:master