some things
Merge pull request #5 from ansballard/master

some things