Merge pull request #12 from josieh/master

started from the base now we here
this thing