improved usability, closes #170