adition of axis
fixed confict
Merge pull request #36 from muduno/benjiLees

Benji lees