Merge onesup:master

Merge onesup:master
Merge pull request #3 from grammaright/onesup-master

Merge onesup:master