Add #45 feature