Merge pull request #3 from phlco/master

HW 2014-11-17