Finished summary
Merge branch 'master' of github.com:kaar/liu
finished summary