Merge branch 'master' of https://github.com/bane-shinsuke/aquarius

Signed-off-by: Shinsuke Akabane <bane.shinsuke@gmail.com>
Merge branch 'master' of https://github.com/bane-shinsuke/aquarius