second branch ready for merging fixes #1

explanation