greatest commit ever
Merge pull request #3 from oulab/master

hey please merge