Really adding them this time
Merge pull request #3 from torandu/working

Really adding them this time