initial commit, vanilla 0.11.4 + few fixes