-Made Hassan's code look silly (I know you wern't done yet). Now it's awesome.
Merge pull request #376 from mmcguinn/master

-Made Hassan's code look silly (I know you wern't done yet). Now it's aw...