Changed license + Made fixes after Sensio Insight test
View : https://insight.sensiolabs.com/projects/79130396-6820-46ba-9412-5e3c29429845/analyses/2