code done
Merge pull request #1 from LichK/code-done

code done