final version

v 1.0
comments and fine tuning