Alexandru

merging alexandru to master. code ready for demo