fixed small things
Merge pull request #51 from AkramKahin/smallthings

Smallthings
fixed conflicts