make everything work
Merge pull request #1 from jbrinley/master

make everything work