removed old coments/code
added possible solution for #101