alex - correct pull request

fixed with header etc, #101 #92 #78 #64