Merge pull request #1 from paulmai/master

Yaay -- Pull this