committing stuff
Merge pull request #4 from nyanzebra/robbranch

committing stuff