Small modifications
Merge pull request #2 from trashy111/patch-1

Small modifications