forgot to commit

bug fix
adjust indents
Import origin master fix

import fix by Mr.hotta
[MERGE] merge pull request