s
Merge pull request #18 from nicintosh/master

w