Merge branch 'feature/#395_create_base' of https://github.com/myoo/sabatora into feature/#395_create_base