closes #143
remake
1.1.1