Will fix this soon. Need to read and test few things. Sorry merging for now,