added 7
added 8
Merge branch 'master' of https://github.com/masterslayer/keeper into two