Alex's commit
Merge pull request #1 from archplut/master

Alex's commit