upstream
Basically working
Merge pull request #8 from damemi/master

Working