Updated comments a bit
Bugfix for issue #16