incorporating comments
Merge branch 'master' of github.com:ajantriks/iwp into gh-pages