Merge pull request #4 from bau5/master

Forgot to ever merge these
Working on machines still