Merge pull request #30 from ray1203/yerin#31

RightHennessy wants to merge 5 commits intoyerinray1203/te2ris:yerinfrom

masterray1203/te2ris:masterCopy head branch name to clipboard