#2 #3 closed. ready for pull request