Development

PR #35 #36 #37 #38 #39 :+1: