working version for testing; values replacement will be added soon
Merge pull request #601 from georgebyelas/master

working version for testing; values replacement will be added soon