closed #12 feature