s
Merge pull request #19 from nicintosh/master

w