Commenting out to merge into master branch
Less global scope pollution
Added revision counter
cleanup
Better version names
remove useless variables
merge&cleanup test-commits