replaced float with double
replaced float with double
first implementation of requirement v3
Merge branch 'devel'