Merge pull request #8 from nyrnzn/naya

this is it
naya commit