Made some changes
Merge pull request #1 from ronlib/small_fix

Made some changes