Adding some stuff from local to push to my fork to then make pull request
Merge pull request #4 from pchittum/master

Some stuff from Peter