new stuff
Merge pull request #330 from jgho/newStuff

new stuff