refactoring & github:#5,#6
Merge origin/master