Merge pull request #2 from bursteg/master

123