added more stuff
Merge pull request #1 from fizker/branch

added more stuff