slash update
Merge pull request #15 from bmatusiak/master

slash update