optimized
Merge pull request #4 from CobyGoldbergs/master

optimized