added needed stuff we initially forgot (blush)_
Merge pull request #4 from manarius/master

added stuff we missed