Merge pull request #28 from DustInMonteriggioni/master

Master into LC
Still still uncommitted chagnes
backout
Try to solve conflict
Merge pull request #33 from DustInMonteriggioni/LC

Lc