Merge pull request #23 from roselone/master

update
update
Merge pull request #25 from roselone/master

update
update
Merge remote-tracking branch 'origin/master'
update
update
update
Merge pull request #62 from purejade/master

add plan update