syncing up with repo
Merge branch 'master' of https://github.com/benthemonkey/SlivkaWebFeatures