Florin

I am going to merge Florin's branch with the master - hope that is ok with you guys:)