[enhancement] closes #1