Merge pull request #37 from aspangaro/3.4

Fix :: Select active account in list
Merge pull request #38 from aspangaro/3.4

Fix :: Only active account into list
Merge branch 'Upstream/3.4'