Merge branch 'master' into '46-enhancing-r-optimize-getbirthplace-r'

# Conflicts:
#   processing/wikiproc/R/get_birthplace.R

processing/wikiproc/R/get_birthdate.R

@@ -43,8 +43,8 @@ get_birthdate <- function(article) {
 
   } else {
 
-    # Return Null if there is no birthdate
-    return(NULL)
+    # Return NA if there is no birthdate
+    return(NA)
   }
 }
 

processing/wikiproc/R/get_no_of_spouses.R

@@ -15,20 +15,20 @@
 #' @examples
 #' \dontrun{
 #' articles <- get_data()
-#' 
+#'
 #' no.spouses <- get_no_of_spouses(articles$Text[54])
-#' 
-#' no,spouses 
+#'
+#' no.spouses
 #' }
 get_no_of_spouses <- function(article) {
-  
+
   # If there is no infobox we assume there were no spouses
   if(!grepl("vcard", article)) {
     return(0)
   }
-  
+
   infoBox <- get_infobox(article)
-  
+
   # Get the spouse field
   spouses <- infoBox[infoBox$Desc %like% "Spouse",]$Content
   # Remove everything in parentheses