Push everything i did.
Merge pull request #475 from alexbegt/master

Push everything i did.