mrchacon-wip

merge my work to master branch