Merge pull request #1 from EE590-Spring2014/master

a