My commit
Merge pull request #34 from Sponster/master

1301681051_Stilian Mirchev