add some stuff
Merge pull request #2 from ballchen/feature/environment

add some stuff