Used request get() instead of parsing full URL
Added word separator and fixed up some action parsing
Merge branch 'master' into website